1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
--- aclocal.m4.orig Tue Oct 14 20:48:14 1997
+++ aclocal.m4 Tue Oct 14 20:49:02 1997
@@ -48,7 +48,7 @@
AC_DEFUN(AM_PROG_INSTALL,
[AC_REQUIRE([AC_PROG_INSTALL])
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
AC_SUBST(INSTALL_SCRIPT)dnl
])
--- configure.in.orig Mon Dec 15 11:44:48 1997
+++ configure.in Thu Dec 18 00:36:24 1997
@@ -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
@@ -240,7 +240,7 @@
AC_C_INLINE
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
dnl This is for generating PDB docuemntation.
AC_PATH_PROG(EMACS, emacs, :)
--- configure.orig Mon Dec 15 12:39:24 1997
+++ configure Thu Dec 18 00:38:43 1997
@@ -2722,14 +2722,14 @@
fi
if test -z "$LIBTIFF_LIB"; then
- echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
-echo "configure:2727: 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:2727: 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 2735 "configure"
#include "confdefs.h"
@@ -2757,17 +2757,17 @@
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
-echo "configure:2765: 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:2765: 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 2773 "configure"
#include "confdefs.h"
@@ -2795,7 +2795,7 @@
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
@@ -3933,7 +3933,7 @@
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
# Extract the first word of "emacs", so it can be a program name with args.
set dummy emacs; ac_word=$2
|
