1998-03-11 02:58:23 +00:00
|
|
|
--- configure.orig Fri Feb 20 09:42:49 1998
|
|
|
|
+++ configure Tue Mar 10 09:40:36 1998
|
|
|
|
@@ -826,6 +826,7 @@
|
|
|
|
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
|
|
|
|
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
|
|
|
# ./install, which can be erroneously created by make from ./install.sh.
|
|
|
|
+INSTALL='/usr/bin/install -c'
|
|
|
|
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
|
|
|
echo "configure:831: checking for a BSD compatible install" >&5
|
|
|
|
if test -z "$INSTALL"; then
|
|
|
|
@@ -2590,14 +2591,14 @@
|
|
|
|
fi
|
|
|
|
|
1998-02-18 15:36:14 +00:00
|
|
|
|
1998-03-11 02:58:23 +00:00
|
|
|
- echo $ac_n "checking for TIFFOpen in -ltiff""... $ac_c" 1>&6
|
|
|
|
-echo "configure:2595: checking for TIFFOpen in -ltiff" >&5
|
1998-02-18 15:36:14 +00:00
|
|
|
-ac_lib_var=`echo tiff'_'TIFFOpen | sed 'y%./+-%__p_%'`
|
1998-03-11 02:58:23 +00:00
|
|
|
+ echo $ac_n "checking for TIFFOpen in -ltiff34""... $ac_c" 1>&6
|
|
|
|
+echo "configure:2595: checking for TIFFOpen in -ltiff34" >&5
|
1998-02-18 15:36:14 +00:00
|
|
|
+ac_lib_var=`echo tiff34'_'TIFFOpen | sed 'y%./+-%__p_%'`
|
|
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
|
|
else
|
|
|
|
ac_save_LIBS="$LIBS"
|
|
|
|
-LIBS="-ltiff \
|
|
|
|
+LIBS="-ltiff34 \
|
1998-03-11 02:58:23 +00:00
|
|
|
-L/usr/lib -L/lib -L/usr/local/lib -L/usr/X11/lib -L/usr/X11R6/lib \
|
|
|
|
-L/usr/local/X11/lib -L/usr/openwin/lib -lc -lm $LIBS"
|
1998-02-18 15:36:14 +00:00
|
|
|
cat > conftest.$ac_ext <<EOF
|
1998-03-11 02:58:23 +00:00
|
|
|
@@ -2627,13 +2628,13 @@
|
|
|
|
fi
|
1998-02-18 15:36:14 +00:00
|
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|
|
|
echo "$ac_t""yes" 1>&6
|
1998-03-11 02:58:23 +00:00
|
|
|
- ac_tr_lib=HAVE_LIB`echo tiff | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
|
|
|
+ ac_tr_lib=HAVE_LIB`echo tiff34 | sed -e 's/[^a-zA-Z0-9_]/_/g' \
|
|
|
|
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
|
|
|
|
cat >> confdefs.h <<EOF
|
|
|
|
#define $ac_tr_lib 1
|
|
|
|
EOF
|
|
|
|
|
|
|
|
- LIBS="-ltiff $LIBS"
|
|
|
|
+ LIBS="-ltiff34 $LIBS"
|
|
|
|
|
1998-02-18 15:36:14 +00:00
|
|
|
else
|
|
|
|
echo "$ac_t""no" 1>&6
|
1998-03-11 02:58:23 +00:00
|
|
|
@@ -2642,7 +2643,7 @@
|
|
|
|
if test "" != ""; then
|
|
|
|
enl_lib_subdir=
|
|
|
|
else
|
|
|
|
- enl_lib_subdir=tiff
|
|
|
|
+ enl_lib_subdir=tiff34
|
|
|
|
fi
|
|
|
|
enl_cur_var=tiff_TIFFOpen
|
|
|
|
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
|
|
|
|
@@ -2673,11 +2674,11 @@
|
|
|
|
fi
|
|
|
|
echo "$ac_t""$enl_tmp_var" 1>&6
|
|
|
|
\
|
|
|
|
-extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff"
|
|
|
|
+extras="$extras -DBUILTIN_TIFF"; LIBS="$LIBS -lm -ltiff34"
|
|
|
|
else
|
|
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
\
|
|
|
|
-{ echo "configure: error: ********** Disabling libtiff support ************" 1>&2; exit 1; }
|
|
|
|
+{ echo "configure: error: ********** Disabling libtiff34 support ************" 1>&2; exit 1; }
|
|
|
|
fi
|
1998-02-18 15:36:14 +00:00
|
|
|
|
1998-03-11 02:58:23 +00:00
|
|
|
|