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
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
|
--- configure.orig Thu Jan 21 00:10:05 1999
+++ configure Fri Jan 22 03:38:47 1999
@@ -2173,8 +2173,8 @@
echo "configure:2174: checking If dynamic linking works on this system" >&5
oLIBS="$LIBS"
oCFLAGS="$CFLAGS"
- LIBS="$LIBS `glib-config --libs gmodule`"
- CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
+ LIBS="$LIBS `glib11d-config --libs gmodule`"
+ CFLAGS="$CFLAGS `glib11d-config --cflags gmodule`"
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
@@ -2223,8 +2223,8 @@
#define USE_GMODULE 1
EOF
- GMODULE_LIBS="`glib-config --libs gmodule`"
- GMODULE_FLAGS="`glib-config --cflags gmodule`"
+ GMODULE_LIBS="`glib11d-config --libs gmodule`"
+ GMODULE_FLAGS="`glib11d-config --cflags gmodule`"
echo "$ac_t""yes" 1>&6
@@ -2248,140 +2248,6 @@
DYNAMIC_MODULES_WORK_TRUE='#'
DYNAMIC_MODULES_WORK_FALSE=
fi
-# Extract the first word of "djpeg", so it can be a program name with args.
-set dummy djpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2255: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$DJPEG_PROG" in
- /*)
- ac_cv_path_DJPEG_PROG="$DJPEG_PROG" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_DJPEG_PROG="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-DJPEG_PROG="$ac_cv_path_DJPEG_PROG"
-if test -n "$DJPEG_PROG"; then
- echo "$ac_t""$DJPEG_PROG" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "cjpeg", so it can be a program name with args.
-set dummy cjpeg; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2286: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$CJPEG_PROG" in
- /*)
- ac_cv_path_CJPEG_PROG="$CJPEG_PROG" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_CJPEG_PROG="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-CJPEG_PROG="$ac_cv_path_CJPEG_PROG"
-if test -n "$CJPEG_PROG"; then
- echo "$ac_t""$CJPEG_PROG" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
-# Extract the first word of "convert", so it can be a program name with args.
-set dummy convert; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2318: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$CONVERT_PROG" in
- /*)
- ac_cv_path_CONVERT_PROG="$CONVERT_PROG" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_CONVERT_PROG="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-CONVERT_PROG="$ac_cv_path_CONVERT_PROG"
-if test -n "$CONVERT_PROG"; then
- echo "$ac_t""$CONVERT_PROG" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-echo "CONVERT_PROG is $CONVERT_PROG"
-CONVERT_PATH=`echo $CONVERT_PROG | sed 's/\/convert//'`
-echo "CONVERT_PATH is $CONVERT_PATH"
-
-
-# Extract the first word of "giftopnm", so it can be a program name with args.
-set dummy giftopnm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2354: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$GIFTOPNM_PROG" in
- /*)
- ac_cv_path_GIFTOPNM_PROG="$GIFTOPNM_PROG" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_GIFTOPNM_PROG="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-GIFTOPNM_PROG="$ac_cv_path_GIFTOPNM_PROG"
-if test -n "$GIFTOPNM_PROG"; then
- echo "$ac_t""$GIFTOPNM_PROG" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-echo "GIFTOPNM_PROG is $GIFTOPNM_PROG"
-NETPBM_PATH=`echo $GIFTOPNM_PROG | sed 's/\/giftopnm//'`
-echo "NETPBM_PATH is $NETPBM_PATH"
-
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:2388: checking how to run the C preprocessor" >&5
@@ -3987,7 +3853,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lXext $X_LIBS $LIBS"
+LIBS="-lXext -lX11 $X_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 3993 "configure"
#include "confdefs.h"
@@ -4322,7 +4188,7 @@
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-ltiff $GX_LIBS $LIBS"
+LIBS="-ltiff -ljpeg -lz $GX_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4328 "configure"
#include "confdefs.h"
@@ -4549,16 +4415,16 @@
-ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
-echo "configure:4555: checking for gif_lib.h" >&5
+ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
+echo "configure:4555: checking for giflib/gif_lib.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 4560 "configure"
#include "confdefs.h"
-#include <gif_lib.h>
+#include <giflib/gif_lib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
