2000-06-13 22:57:18 +00:00
|
|
|
--- configure.orig Wed May 10 00:02:39 2000
|
|
|
|
+++ configure Tue Jun 13 16:40:13 2000
|
|
|
|
@@ -1839,8 +1839,8 @@
|
1999-12-28 02:26:40 +00:00
|
|
|
|
|
|
|
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
|
2000-06-13 22:57:18 +00:00
|
|
|
@@ -1860,8 +1860,8 @@
|
1999-12-28 02:26:40 +00:00
|
|
|
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
|
2000-06-13 22:57:18 +00:00
|
|
|
@@ -2676,7 +2676,7 @@
|
1999-12-28 02:26:40 +00:00
|
|
|
fi
|
|
|
|
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
|
|
|
|
echo "$ac_t""yes" 1>&6
|
|
|
|
- PTHREAD_LIB="-lc_r"
|
|
|
|
+ PTHREAD_LIB=""
|
|
|
|
else
|
|
|
|
echo "$ac_t""no" 1>&6
|
|
|
|
echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
|
2000-06-13 22:57:18 +00:00
|
|
|
@@ -4591,7 +4591,7 @@
|
1999-12-28 02:26:40 +00:00
|
|
|
cat conftest.$ac_ext >&5
|
|
|
|
rm -rf conftest*
|
|
|
|
CATOBJEXT=.mo
|
|
|
|
- DATADIRNAME=lib
|
|
|
|
+ DATADIRNAME=share
|
|
|
|
fi
|
|
|
|
rm -f conftest*
|
|
|
|
INSTOBJEXT=.mo
|
2000-06-13 22:57:18 +00:00
|
|
|
@@ -5915,8 +5915,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`"
|
|
|
|
|
|
|
|
|
|
|
|
|