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
|
$NetBSD: patch-ag,v 1.3 2002/03/29 18:01:14 wiz Exp $
--- configure.orig Mon Mar 25 17:45:33 2002
+++ configure
@@ -5596,6 +5596,43 @@
fi
+# Extract the first word of "glib-config", so it can be a program name with args.
+set dummy glib-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:5578: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ case "$GLIB_CONFIG" in
+ /*)
+ ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path.
+ ;;
+ ?:/*)
+ ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a dos path.
+ ;;
+ *)
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
+ ac_dummy="$PATH"
+ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ test -z "$ac_cv_path_GLIB_CONFIG" && ac_cv_path_GLIB_CONFIG="no"
+ ;;
+esac
+fi
+GLIB_CONFIG="$ac_cv_path_GLIB_CONFIG"
+if test -n "$GLIB_CONFIG"; then
+ echo "$ac_t""$GLIB_CONFIG" 1>&6
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+
dynworks=false
if test x$with_modules = xno; then
echo "$ac_t""no" 1>&6
@@ -5605,8 +5642,8 @@
if test "x$GDK_IMLIB" != x; then
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
@@ -5656,8 +5693,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`"
fi
@@ -7365,7 +7402,9 @@
GX_LIBS="$GTK_LIBS"
fi
-CPPFLAGS="$CPPFLAGS -I$includedir -I$prefix/include"
+if test -z "$X_LDFLAGS"; then
+ X_LDFLAGS=
+fi
SUPPORT_LIBS=""
@@ -7670,8 +7709,8 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- TIFFLIBS="-ltiff"
- SUPPORT_LIBS="$SUPPORT_LIBS -ltiff"; cat >> confdefs.h <<\EOF
+ TIFFLIBS="-ltiff -ljpeg -lz"
+ SUPPORT_LIBS="$SUPPORT_LIBS -ltiff -ljpeg -lz"; cat >> confdefs.h <<\EOF
#define HAVE_LIBTIFF 1
EOF
@@ -8137,6 +8176,7 @@
+
trap '' 1 2 15
cat > confcache <<\EOF
# This file is a shell script that caches the results of configure
@@ -8317,6 +8357,7 @@
s%@GTK_CONFIG@%$GTK_CONFIG%g
s%@GTK_CFLAGS@%$GTK_CFLAGS%g
s%@GTK_LIBS@%$GTK_LIBS%g
+s%@GLIB_CONFIG@%$GLIB_CONFIG%g
s%@GMODULE_LIBS@%$GMODULE_LIBS%g
s%@GMODULE_FLAGS@%$GMODULE_FLAGS%g
s%@TIFFLIBS@%$TIFFLIBS%g
@@ -8341,6 +8382,7 @@
s%@HAVE_JPEG_FALSE@%$HAVE_JPEG_FALSE%g
s%@SUPPORT_LIBS@%$SUPPORT_LIBS%g
s%@GDK_SUPPORT_LIBS@%$GDK_SUPPORT_LIBS%g
+s%@X_LDFLAGS@%$X_LDFLAGS%g
CEOF
EOF
|
