1998-04-29 21:02:00 +00:00
|
|
|
--- configure.in.old Tue Apr 28 09:04:13 1998
|
|
|
|
+++ configure.in Tue Apr 28 09:07:13 1998
|
1998-04-17 13:31:19 +00:00
|
|
|
@@ -115,13 +115,13 @@
|
1997-12-18 20:40:24 +00:00
|
|
|
|
|
|
|
dnl Test for libtiff
|
|
|
|
if test -z "$LIBTIFF_LIB"; then
|
|
|
|
- AC_CHECK_LIB(tiff, TIFFReadScanline,
|
|
|
|
+ AC_CHECK_LIB(tiff34, TIFFReadScanline,
|
1998-04-17 13:31:19 +00:00
|
|
|
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,
|
1997-12-18 20:40:24 +00:00
|
|
|
+ AC_CHECK_LIB(tiff34, TIFFWriteScanline,
|
1998-04-17 13:31:19 +00:00
|
|
|
AC_CHECK_HEADER(tiffio.h,
|
1998-04-29 21:02:00 +00:00
|
|
|
- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
|
|
|
|
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz',
|
1998-04-17 13:31:19 +00:00
|
|
|
AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
|
1998-04-29 21:02:00 +00:00
|
|
|
AC_CHECK_LIB(tiff34, TIFFFlushData,
|
|
|
|
AC_CHECK_HEADER(tiffio.h,
|
|
|
|
@@ -303,7 +303,7 @@
|
1998-03-17 22:52:44 +00:00
|
|
|
LIBS="$gimp_save_LIBS"
|
1997-07-14 22:19:18 +00:00
|
|
|
|
1998-03-17 22:52:44 +00:00
|
|
|
gimpdatadir=$datadir/gimp
|
1997-12-16 22:06:42 +00:00
|
|
|
-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
|
|
|
|
+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
|
1997-07-14 22:19:18 +00:00
|
|
|
|
1998-04-17 13:31:19 +00:00
|
|
|
brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
|
|
|
|
gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
|
1998-04-29 21:02:00 +00:00
|
|
|
--- configure.old Tue Apr 28 09:04:06 1998
|
|
|
|
+++ configure Tue Apr 28 09:09:45 1998
|
|
|
|
@@ -2281,14 +2281,14 @@
|
1998-03-17 22:52:44 +00:00
|
|
|
fi
|
1997-12-18 20:40:24 +00:00
|
|
|
|
|
|
|
if test -z "$LIBTIFF_LIB"; then
|
|
|
|
- echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
|
1998-04-29 21:02:00 +00:00
|
|
|
-echo "configure:2286: checking for TIFFReadScanline in -ltiff" >&5
|
1997-12-18 20:40:24 +00:00
|
|
|
-ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
|
|
|
|
+ echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
|
1998-04-29 21:02:00 +00:00
|
|
|
+echo "configure:2286: checking for TIFFReadScanline in -ltiff34" >&5
|
1997-12-18 20:40:24 +00:00
|
|
|
+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
|
1998-04-29 21:02:00 +00:00
|
|
|
#line 2294 "configure"
|
1997-12-18 20:40:24 +00:00
|
|
|
#include "confdefs.h"
|
1998-04-29 21:02:00 +00:00
|
|
|
@@ -2344,7 +2344,7 @@
|
1997-12-18 20:40:24 +00:00
|
|
|
fi
|
1998-04-17 13:31:19 +00:00
|
|
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
1997-12-18 20:40:24 +00:00
|
|
|
echo "$ac_t""yes" 1>&6
|
|
|
|
- TIFF='tiff'; LIBTIFF_LIB='-ltiff'
|
|
|
|
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34'
|
1998-04-17 13:31:19 +00:00
|
|
|
else
|
|
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
|
1998-04-29 21:02:00 +00:00
|
|
|
@@ -2352,14 +2352,14 @@
|
1998-04-17 13:31:19 +00:00
|
|
|
|
1997-12-18 20:40:24 +00:00
|
|
|
else
|
|
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
-echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
|
1998-04-29 21:02:00 +00:00
|
|
|
-echo "configure:2357: checking for TIFFWriteScanline in -ltiff" >&5
|
1997-12-18 20:40:24 +00:00
|
|
|
-ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
|
|
|
|
+echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
|
1998-04-29 21:02:00 +00:00
|
|
|
+echo "configure:2357: checking for TIFFWriteScanline in -ltiff34" >&5
|
1997-12-18 20:40:24 +00:00
|
|
|
+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"
|
1998-04-29 21:02:00 +00:00
|
|
|
-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
|
|
|
|
+LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
|
1997-12-18 20:40:24 +00:00
|
|
|
cat > conftest.$ac_ext <<EOF
|
1998-04-29 21:02:00 +00:00
|
|
|
#line 2365 "configure"
|
1997-12-18 20:40:24 +00:00
|
|
|
#include "confdefs.h"
|
1998-04-29 21:02:00 +00:00
|
|
|
@@ -2415,7 +2415,7 @@
|
1997-12-18 20:40:24 +00:00
|
|
|
fi
|
1998-04-17 13:31:19 +00:00
|
|
|
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
|
1997-12-18 20:40:24 +00:00
|
|
|
echo "$ac_t""yes" 1>&6
|
1998-04-29 21:02:00 +00:00
|
|
|
- TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz'
|
|
|
|
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz'
|
1997-12-18 20:40:24 +00:00
|
|
|
else
|
|
|
|
echo "$ac_t""no" 1>&6
|
1998-04-17 13:31:19 +00:00
|
|
|
echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
|
1998-04-29 21:02:00 +00:00
|
|
|
@@ -4144,7 +4144,7 @@
|
1998-04-17 13:31:19 +00:00
|
|
|
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`
|