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
|
$NetBSD: patch-aa,v 1.8 2002/07/12 23:38:45 mycroft Exp $
--- configure.orig Thu Jun 20 04:40:53 2002
+++ configure Wed Jul 10 22:54:42 2002
@@ -5989,8 +5989,8 @@
fi
if test x$gnome_cv_orbit_found = xyes; then
- ORBIT_CFLAGS=`orbit-config --cflags client server`
- ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
+ ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server`
+ ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server`
else
@@ -6007,8 +6007,8 @@
gnome_cv_gnorba_found=no
if test x$gnome_cv_orbit_found = xyes; then
- GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
- GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
+ GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
+ GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
if test -n "$GNORBA_LIBS"; then
gnome_cv_gnorba_found=yes
fi
@@ -6028,8 +6028,8 @@
fi
if test x$gnome_cv_orbit_found = xyes; then
- GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
- GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
+ GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
+ GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
else
@@ -8585,8 +8585,11 @@
echo $ac_n "checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0""... $ac_c" 1>&6
echo "configure:8588: checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0" >&5
-if xml-config --libs > /dev/null 2>&1; then
- vers=`xml-config --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+if test -z "$XML_CONFIG"; then
+ XML_CONFIG=xml-config
+fi
+if $XML_CONFIG --libs > /dev/null 2>&1; then
+ vers=`$XML_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test "$vers" -ge 1008008; then
if test "$vers" -lt 2000000; then
echo "$ac_t""found" 1>&6
@@ -8952,8 +8955,8 @@
echo $ac_n "checking for GnomePrint libraries >= 0.25""... $ac_c" 1>&6
echo "configure:8955: checking for GnomePrint libraries >= 0.25" >&5
-if gnome-config --libs print > /dev/null 2>&1; then
- vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" -e 's/cvs$//' -e 's/pre$//' | \
+if $GNOME_CONFIG --libs print > /dev/null 2>&1; then
+ vers=`$GNOME_CONFIG --modversion print | sed -e "s/gnome-print-//" -e 's/cvs$//' -e 's/pre$//' | \
awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
if test "$vers" -ge 25; then
echo "$ac_t""found" 1>&6
@@ -8966,8 +8969,8 @@
echo $ac_n "checking for Glade libraries >= 0.13""... $ac_c" 1>&6
echo "configure:8969: checking for Glade libraries >= 0.13" >&5
-if gnome-config --libs libglade > /dev/null 2>&1; then
- vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
+if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then
+ vers=`$GNOME_CONFIG --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
if test "$vers" -ge 13; then
echo "$ac_t""found" 1>&6
else
@@ -8993,8 +8996,8 @@
echo $ac_n "checking for GNOME-VFS""... $ac_c" 1>&6
echo "configure:8996: checking for GNOME-VFS" >&5
-if gnome-config --libs vfs > /dev/null 2>&1; then
- vers=`gnome-config --modversion vfs`
+if $GNOME_CONFIG --libs vfs > /dev/null 2>&1; then
+ vers=`$GNOME_CONFIG --modversion vfs`
case $vers
in
gnome-vfs-0.012) vfs_ok=false ;;
@@ -9007,8 +9010,8 @@
if $vfs_ok; then
echo "$ac_t""$vers" 1>&6
- GNOME_VFS_LIBS="`gnome-config --libs vfs`"
- GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
+ GNOME_VFS_LIBS="`$GNOME_CONFIG --libs vfs`"
+ GNOME_VFS_CFLAGS="`$GNOME_CONFIG --cflags vfs`"
@@ -9074,8 +9077,8 @@
-EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `imlib-config --libs-gdk`"
-EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `imlib-config --cflags-gdk`"
+EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `$IMLIB_CONFIG --libs-gdk`"
+EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `$IMLIB_CONFIG --cflags-gdk`"
|
