blob: ac2b97677a294eb01e97f936be992190b159163b (
plain) (
blame)
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
|
--- configure.orig Wed May 10 00:02:39 2000
+++ configure Tue Jun 13 16:40:13 2000
@@ -1839,8 +1839,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
@@ -1860,8 +1860,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
@@ -2676,7 +2676,7 @@
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
@@ -4591,7 +4591,7 @@
cat conftest.$ac_ext >&5
rm -rf conftest*
CATOBJEXT=.mo
- DATADIRNAME=lib
+ DATADIRNAME=share
fi
rm -f conftest*
INSTOBJEXT=.mo
@@ -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`"
|
