--- configure.in~ Thu Apr 16 20:00:52 1998
+++ configure.in Thu Apr 16 20:02:07 1998
@@ -115,13 +115,13 @@
dnl Test for libtiff
if test -z "$LIBTIFF_LIB"; then
- AC_CHECK_LIB(tiff, TIFFReadScanline,
+ AC_CHECK_LIB(tiff34, TIFFReadScanline,
AC_CHECK_HEADER(tiffio.h,
- TIFF='tiff'; LIBTIFF_LIB='-ltiff',
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34',
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
- AC_CHECK_LIB(tiff, TIFFWriteScanline,
+ AC_CHECK_LIB(tiff34, TIFFWriteScanline,
AC_CHECK_HEADER(tiffio.h,
- TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
fi
@@ -299,7 +299,7 @@
LIBS="$gimp_save_LIBS"
gimpdatadir=$datadir/gimp
-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
--- configure~ Thu Apr 16 20:00:58 1998
+++ configure Thu Apr 16 20:04:59 1998
@@ -2282,14 +2282,14 @@
fi
if test -z "$LIBTIFF_LIB"; then
- echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
-echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
+echo "configure:2287: checking for TIFFReadScanline in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'TIFFReadScanline | 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 -lm $LIBS"
+LIBS="-ltiff34 -lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2295 "configure"
#include "confdefs.h"
@@ -2345,7 +2345,7 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- TIFF='tiff'; LIBTIFF_LIB='-ltiff'
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34'
else
echo "$ac_t""no" 1>&6
echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
@@ -2353,14 +2353,14 @@
else
echo "$ac_t""no" 1>&6
-echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
-echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
+echo "configure:2358: checking for TIFFWriteScanline in -ltiff34" >&5
+ac_lib_var=`echo tiff34'_'TIFFWriteScanline | 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 -lz -ljpeg -lm $LIBS"
+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2366 "configure"
#include "confdefs.h"
@@ -2416,7 +2416,7 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
else
echo "$ac_t""no" 1>&6
echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
@@ -4070,7 +4070,7 @@
LIBS="$gimp_save_LIBS"
gimpdatadir=$datadir/gimp
-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
