blob: 4922873980a74d66b10f102c021b4d85767b5f7d (
plain)
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
|
--- configure.orig Tue Oct 19 07:52:34 1999
+++ configure Mon Apr 3 08:26:32 2000
@@ -1826,7 +1826,7 @@
LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+LIBTOOL="/usr/local/bin/libtool"
# Redirect the config.log output again, so that the ltconfig log is not
# clobbered by the next message.
@@ -2367,8 +2367,8 @@
echo "configure:2368: checking whether to build gmodulized imlib" >&5
oLIBS="$LIBS"
oCFLAGS="$CFLAGS"
- LIBS="$LIBS `glib-config --libs gmodule`"
- CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
+ LIBS="$LIBS `${GLIB_CONFIG} --libs gmodule`"
+ CFLAGS="$CFLAGS `${GLIB_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
@@ -2389,7 +2389,7 @@
EOF
if { (eval echo configure:2391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
- dynworks=true
+ dynworks=false
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
@@ -2418,8 +2418,8 @@
#define USE_GMODULE 1
EOF
- GMODULE_LIBS="`glib-config --libs gmodule`"
- GMODULE_FLAGS="`glib-config --cflags gmodule`"
+ GMODULE_LIBS="`${GLIB_CONFIG} --libs gmodule`"
+ GMODULE_FLAGS="`${GLIB_CONFIG} --cflags gmodule`"
echo "$ac_t""yes" 1>&6
@@ -4536,7 +4536,7 @@
echo "$ac_t""$jpeg_ok" 1>&6
if test "$jpeg_ok" = yes; then
JPEGLIBS="-ljpeg"
- SUPPORT_LIBS="$SUPPORT_LIBS -ljpeg"; cat >> confdefs.h <<\EOF
+ SUPPORT_LIBS="$SUPPORT_LIBS"; cat >> confdefs.h <<\EOF
#define HAVE_LIBJPEG 1
EOF
|
