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
|
--- configure.orig Mon Oct 14 06:41:32 2002
+++ configure Mon Oct 14 22:12:45 2002
@@ -7484,6 +7484,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'
@@ -11841,14 +11842,14 @@
LIBNAUTILUS_LIBS="`$PKG_CONFIG --libs $LIBNAUTILUS_MODULES`"
-LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | $srcdir/add-include-prefix`"
+LIBNAUTILUS_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $LIBNAUTILUS_MODULES | xargs -n1 echo -n ' -I '`"
CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES"
CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags"
CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $LIBJPEG $x_libs"
-CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`"
+CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | xargs -n1 echo -n ' -I '`"
COMPONENT_MODULES="eel-2.0 libbonoboui-2.0 gnome-vfs-module-2.0 gnome-desktop-2.0"
COMPONENT_CFLAGS="`$PKG_CONFIG --cflags $COMPONENT_MODULES`"
@@ -12579,9 +12580,9 @@
s,@ORBIT_CONFIG@,$ORBIT_CONFIG,;t t
s,@ORBIT_IDL@,$ORBIT_IDL,;t t
s,@ORBIT_CFLAGS@,$ORBIT_CFLAGS,;t t
-s,@ORBIT_LIBS@,$ORBIT_LIBS,;t t
+s~@ORBIT_LIBS@~$ORBIT_LIBS~;t t
s,@ALL_CFLAGS@,$ALL_CFLAGS,;t t
-s,@ALL_LIBS@,$ALL_LIBS,;t t
+s~@ALL_LIBS@~$ALL_LIBS~;t t
s,@GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
s,@ALLOCA@,$ALLOCA,;t t
s,@USE_NLS@,$USE_NLS,;t t
@@ -12633,26 +12634,26 @@
s,@HAVE_JW_FALSE@,$HAVE_JW_FALSE,;t t
s,@HAVE_JW@,$HAVE_JW,;t t
s,@MEDUSA_CFLAGS@,$MEDUSA_CFLAGS,;t t
-s,@MEDUSA_LIBS@,$MEDUSA_LIBS,;t t
+s~@MEDUSA_LIBS@~$MEDUSA_LIBS~;t t
s,@LIBJPEG@,$LIBJPEG,;t t
s,@GIMPHWRAPBOX_CFLAGS@,$GIMPHWRAPBOX_CFLAGS,;t t
s,@LIBNAUTILUS_CFLAGS@,$LIBNAUTILUS_CFLAGS,;t t
-s,@LIBNAUTILUS_LIBS@,$LIBNAUTILUS_LIBS,;t t
+s~@LIBNAUTILUS_LIBS@~$LIBNAUTILUS_LIBS~;t t
s,@LIBNAUTILUS_IDL_INCLUDES@,$LIBNAUTILUS_IDL_INCLUDES,;t t
s,@CORE_CFLAGS@,$CORE_CFLAGS,;t t
-s,@CORE_LIBS@,$CORE_LIBS,;t t
+s~@CORE_LIBS@~$CORE_LIBS~;t t
s,@CORE_IDL_INCLUDES@,$CORE_IDL_INCLUDES,;t t
s,@COMPONENT_CFLAGS@,$COMPONENT_CFLAGS,;t t
-s,@COMPONENT_LIBS@,$COMPONENT_LIBS,;t t
+s~@COMPONENT_LIBS@~$COMPONENT_LIBS~;t t
s,@MUSIC_COMPONENT_CFLAGS@,$MUSIC_COMPONENT_CFLAGS,;t t
-s,@MUSIC_COMPONENT_LIBS@,$MUSIC_COMPONENT_LIBS,;t t
+s~@MUSIC_COMPONENT_LIBS@~$MUSIC_COMPONENT_LIBS~;t t
s,@EMBLEM_COMPONENT_CFLAGS@,$EMBLEM_COMPONENT_CFLAGS,;t t
s,@EMBLEM_COMPONENT_LIBS@,$EMBLEM_COMPONENT_LIBS,;t t
s,@DISABLE_DEPRECATED_CFLAGS@,$DISABLE_DEPRECATED_CFLAGS,;t t
s,@ENABLE_HARDWARE_VIEW_TRUE@,$ENABLE_HARDWARE_VIEW_TRUE,;t t
s,@ENABLE_HARDWARE_VIEW_FALSE@,$ENABLE_HARDWARE_VIEW_FALSE,;t t
s,@CAPPLET_CFLAGS@,$CAPPLET_CFLAGS,;t t
-s,@CAPPLET_LIBS@,$CAPPLET_LIBS,;t t
+s~@CAPPLET_LIBS@~$CAPPLET_LIBS~;t t
s,@GCONFTOOL@,$GCONFTOOL,;t t
s,@GCONF_SCHEMA_CONFIG_SOURCE@,$GCONF_SCHEMA_CONFIG_SOURCE,;t t
s,@GCONF_SCHEMA_FILE_DIR@,$GCONF_SCHEMA_FILE_DIR,;t t
|
