1998-01-05 17:56:55 +00:00
|
|
|
--- configure.in.orig Sat Jan 3 19:31:29 1998
|
|
|
|
+++ configure.in Mon Jan 5 09:42:49 1998
|
1997-12-18 20:40:24 +00:00
|
|
|
@@ -120,10 +120,10 @@
|
|
|
|
|
|
|
|
dnl Test for libtiff
|
|
|
|
if test -z "$LIBTIFF_LIB"; then
|
|
|
|
- AC_CHECK_LIB(tiff, TIFFReadScanline,
|
|
|
|
- TIFF='tiff'; LIBTIFF_LIB='-ltiff',
|
|
|
|
- AC_CHECK_LIB(tiff, TIFFWriteScanline,
|
|
|
|
- TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
|
|
|
|
+ AC_CHECK_LIB(tiff34, TIFFReadScanline,
|
|
|
|
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34',
|
|
|
|
+ AC_CHECK_LIB(tiff34, TIFFWriteScanline,
|
|
|
|
+ TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
|
|
|
|
AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
|
|
|
|
fi
|
|
|
|
|
1997-12-16 22:06:42 +00:00
|
|
|
@@ -240,7 +240,7 @@
|
|
|
|
AC_C_INLINE
|
1997-07-14 22:19:18 +00:00
|
|
|
|
1997-12-16 22:06:42 +00:00
|
|
|
gimpdatadir=$datadir/$PACKAGE
|
|
|
|
-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
|
|
|
|
1997-12-16 22:06:42 +00:00
|
|
|
dnl This is for generating PDB docuemntation.
|
|
|
|
AC_PATH_PROG(EMACS, emacs, :)
|
1998-01-05 17:56:55 +00:00
|
|
|
--- configure.orig Mon Jan 5 09:44:02 1998
|
|
|
|
+++ configure Mon Jan 5 09:46:45 1998
|
|
|
|
@@ -2531,14 +2531,14 @@
|
1997-12-18 20:40:24 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -z "$LIBTIFF_LIB"; then
|
|
|
|
- echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
|
1998-01-05 17:56:55 +00:00
|
|
|
-echo "configure:2536: 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-01-05 17:56:55 +00:00
|
|
|
+echo "configure:2536: 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-01-05 17:56:55 +00:00
|
|
|
#line 2544 "configure"
|
1997-12-18 20:40:24 +00:00
|
|
|
#include "confdefs.h"
|
1998-01-05 17:56:55 +00:00
|
|
|
@@ -2566,17 +2566,17 @@
|
1997-12-18 20:40:24 +00:00
|
|
|
fi
|
|
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = 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 $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
|
1998-01-05 17:56:55 +00:00
|
|
|
-echo "configure:2574: 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-01-05 17:56:55 +00:00
|
|
|
+echo "configure:2574: 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"
|
|
|
|
-LIBS="-ltiff -lz -ljpeg -lm $LIBS"
|
|
|
|
+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
|
|
|
|
cat > conftest.$ac_ext <<EOF
|
1998-01-05 17:56:55 +00:00
|
|
|
#line 2582 "configure"
|
1997-12-18 20:40:24 +00:00
|
|
|
#include "confdefs.h"
|
1998-01-05 17:56:55 +00:00
|
|
|
@@ -2604,7 +2604,7 @@
|
1997-12-18 20:40:24 +00:00
|
|
|
fi
|
|
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = 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 ***" 1>&2
|
1998-01-05 17:56:55 +00:00
|
|
|
@@ -3742,7 +3742,7 @@
|
1997-07-14 22:19:18 +00:00
|
|
|
|
|
|
|
|
1997-12-16 22:06:42 +00:00
|
|
|
gimpdatadir=$datadir/$PACKAGE
|
|
|
|
-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
|
|
|
|
1997-12-16 22:06:42 +00:00
|
|
|
# Extract the first word of "emacs", so it can be a program name with args.
|
|
|
|
set dummy emacs; ac_word=$2
|