configure/build: Cleanup TIFFINC/LIBTIFF

TIFFINC now matches the other *INC variables.

diff --git a/config.site b/config.site
index bb7d994abfa0fc2d239cc1646df06ab2534810e8..c69fd556bfba82896a90373e8d6be5b2b261189c 100644 (file)
--- a/config.site
+++ b/config.site
@@ -142,7 +142,7 @@
 # non-standard location then setup LIBTIFF accordingly.
 #
 #LIBTIFF="-L/usr/local/lib -ltiff"     # linkage convention for libtiff
-#TIFFINC="/usr/local/include"          # place to find tiffio.h
+#TIFFINC="-I/usr/local/include"                # place to find tiffio.h
 #TIFFBIN="/usr/local/bin"              # where TIFF tools live
 
 #

diff --git a/configure b/configure
index 572a05f5a54c806dee9f197b357f39fa5ac3c7a4..8a0ac972520319373eb074d3bbc7acf4143fcc7f 100755 (executable)
--- a/configure
+++ b/configure
@@ -73,8 +73,8 @@ NLS=auto
 OPTIMIZER="-O"
 LIBCRYPT=
 LIBPAM=
-LIBTIFF="-L/usr/local/lib -ltiff"
-TIFFINC=/usr/local/include
+LIBTIFF="-ltiff"
+TIFFINC=
 TIFFBIN=
 LIBUTIL=
 LIBZ=
@@ -2548,7 +2548,7 @@ main()
 }
 EOF
     capture cat t.c
-    if runMake t "t:; \${CC} \${CVERSION} -I${OTIFFINC} t.c ${LIBTIFF} ${MACHDEPLIBS}"; then
+    if runMake t "t:; \${CC} \${CVERSION} ${OTIFFINC} t.c ${LIBTIFF} ${MACHDEPLIBS}"; then
         header_ver=0
         lib_ver=""
        eval `./a.out | \

diff --git a/debian/rules b/debian/rules
index f2c2ec12e3f6edcd8c621736ff75711fc331bbd8..e39eab43ec62b728a138bf51b029f993d60e6789 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,6 @@ configure-stamp: patch-stamp
                --with-PATH_GSRIP="/usr/bin/gs" \
                --with-MANSCHEME="bsd-source-gzip-strip" \
                --with-INSTALL='${PORT}/../debian/install ${PORT}' \
-               --with-LIBTIFF="-ltiff" \
-               --with-TIFFINC="/usr/include" \
-               --with-TIFFBIN="/usr/bin" \
                --with-LIBZ="-lz" \
                --with-ZLIBINC="-I/usr/include" \
                --with-CONFIG_MAXGID="65534" \

diff --git a/defs.in b/defs.in
index 621f0d989bb9ce9c6e3a82d82856c58d2401910f..b9e75815927d5552bf77100def4e162a7f90a6a4 100644 (file)
--- a/defs.in
+++ b/defs.in
@@ -238,7 +238,7 @@ CINCS               = ${VCINCS} ${LCINCS} ${GCINCS}
 GCOPTS         = @GCOPTS@ ${OPTIMIZER} @PROTOTYPES@
 GCDEFS         = @ANSICPP@
 GCINCS         = -I. -I${DEPTH} -I${REGEXINC} -I${SRCDIR} \
-                   -I${DEPTH}/${TOPSRCDIR}/libhylafax -I${TIFFINC} ${INTLINC}
+                   -I${DEPTH}/${TOPSRCDIR}/libhylafax ${TIFFINC} ${INTLINC}
 #
 # C++ flags are decomposed using the same hierarchy as C flags.
 #
@@ -254,7 +254,7 @@ C++INCS             = ${VC++INCS} ${LC++INCS} ${GC++INCS}
 
 GC++OPTS       = @GCXXOPTS@ ${OPTIMIZER}
 GC++INCS       = -I. -I${DEPTH} -I${REGEXINC} -I${SRCDIR} \
-                   -I${DEPTH}/${TOPSRCDIR}/libhylafax -I${TIFFINC} ${INTLINC}
+                   -I${DEPTH}/${TOPSRCDIR}/libhylafax ${TIFFINC} ${INTLINC}
 GC++DEFS       = @ANSICXXPP@
 
 #