diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -1,5 +1,5 @@ #!/bin/sh -# $Header: /usr/people/sam/tiff/RCS/configure,v 1.32 1996/01/10 19:31:39 sam Exp $ +# $Header: /usr/people/sam/tiff/RCS/configure,v 1.34 1996/02/09 05:53:45 sam Exp $ # # Tag Image File Format (TIFF) Software # @@ -52,7 +52,7 @@ MACHDEPLIBS=-lm : ${MAKE=make} # make to use # screws up the test of `-f -' -unset MAKEFLAGS +: ${MAKEFLAGS=} # unset MAKEFLAGS RM="rm -f" POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions @@ -140,7 +140,7 @@ do -target|--target) ac_prev=TARGET;; -target=*|--target=*) TARGET="$ac_optarg" ;; -version|--version) - echo "This is TIFF configure $Revision: 1.32 $" + echo "This is TIFF configure $Revision: 1.34 $" exit 0 ;; -help|--help) usage; exit 0;; @@ -1071,6 +1071,7 @@ Note "Selecting programs used during installation." # test -z "${CHMOD:-}" && CHMOD=`findAppDef chmod $PATH chmod` test -z "${LN:-}" && LN=`findAppDef ln $PATH ln` +test -z "${SCRIPT_SH:-}" && SCRIPT_SH=`findAppDef sh $PATH sh` test -z "${SED:-}" && SED=`findAppDef sed $PATH sed` test -z "${STRIP:-}" && STRIP=`findAppDef strip $PATH strip` @@ -1452,14 +1453,14 @@ esac if [ "${JPEG}" = yes ]; then test -z "${CONF_JPEG:-}" && CONF_JPEG="-DJPEG_SUPPORT" - test -z "${LIBJPEG:-}" && LIBJPEG="${DIR_JPEGLIB}/libjpeg.a" + test -z "${LIBJPEG:-}" && LIBJPEG="-L${DIR_JPEGLIB} -ljpeg" else CONF_JPEG= LIBJPEG= fi if [ "${ZIP}" = yes ]; then test -z "${CONF_ZIP:-}" && CONF_ZIP="-DZIP_SUPPORT" - test -z "${LIBGZ:-}" && LIBGZ="${DIR_GZLIB}/libz.a" + test -z "${LIBGZ:-}" && LIBGZ="-L${DIR_GZLIB} -lz" else CONF_ZIP= LIBGZ= @@ -1476,7 +1477,9 @@ relativize() if [ $SRCDIR_IS_LIBTIFF = no ]; then (for i do case "$i" in - /*) echo "$i" ;; + /*|-l*) echo "$i" ;; + -L|-L/*) echo "$i" ;; + -L*) echo "$i" | sed 's;-L;-L../;' ;; *) echo "../$i" ;; esac done) | tr '\012' ' ' @@ -1561,6 +1564,7 @@ cat>>confsed<<EOF /@PORT@/s;;${PORT};g /@PORTFUNCS@/s;;${PORTFUNCS};g /@RANLIB@/s;;${RANLIB};g +/@SCRIPT_SH@/s;;${SCRIPT_SH};g /@SED@/s;;${SED};g /@SETMAKE@/s;;${SETMAKE};g /@SRCDIR@/s;;${SRCDIR};g |