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
|
--- configure.orig Thu Oct 24 10:43:46 2002
+++ configure Thu Oct 24 22:06:58 2002
@@ -1265,10 +1265,6 @@
# The aliases save the names the user supplied, while $host etc.
# will get canonicalized.
-test -n "$target_alias" &&
- test "$program_prefix$program_suffix$program_transform_name" = \
- NONENONEs,x,x, &&
- program_prefix=${target_alias}-
GNOME_PILOT_MAJOR=0
GNOME_PILOT_REVISION=1
@@ -6474,6 +6470,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -6707,8 +6704,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
@@ -6727,8 +6724,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
if test xfail = xfailure; then
@@ -11322,8 +11319,8 @@
fi
GPILOT_LIBDIR='-L${libdir}'
-GPILOT_LIBS="-lgpilotd -lgpilotdcm -lgpilotdconduit `$GNOME_CONFIG --libs gnome` `glib-config --libs glib gmodule`"
-GPILOT_INCLUDEDIR="-I${includedir} `$GNOME_CONFIG --cflags gnome` `glib-config --cflags glib gmodule`"
+GPILOT_LIBS="-lgpilotd -lgpilotdcm -lgpilotdconduit `$GNOME_CONFIG --libs gnome` `$GLIB_CONFIG --libs glib gmodule`"
+GPILOT_INCLUDEDIR="-I${includedir} `$GNOME_CONFIG --cflags gnome` `$GLIB_CONFIG --cflags glib gmodule`"
# Check whether --with-oaf or --without-oaf was given.
if test "${with_oaf+set}" = set; then
|