2000-02-16 03:00:03 +00:00
|
|
|
--- gnome-config.in.orig Wed Oct 20 07:36:58 1999
|
|
|
|
+++ gnome-config.in Tue Feb 15 20:50:22 2000
|
1999-08-22 03:42:59 +00:00
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
pkglibdir=${libdir}/@PACKAGE@
|
|
|
|
pkgincludedir=${includedir}/@PACKAGE@
|
|
|
|
MODULE_VERSION=@PACKAGE@-@VERSION@
|
1999-10-14 03:41:26 +00:00
|
|
|
-module_dirs="$libdir"
|
2000-01-14 20:51:19 +00:00
|
|
|
+module_dirs="$sysconfdir:/usr/local/etc"
|
1999-08-22 03:42:59 +00:00
|
|
|
|
1999-10-14 03:41:26 +00:00
|
|
|
# stolen from autoconf
|
|
|
|
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
|
2000-01-14 20:51:19 +00:00
|
|
|
@@ -65,20 +65,21 @@
|
1999-01-14 16:59:34 +00:00
|
|
|
|
|
|
|
Known values for LIBRARY are:
|
|
|
|
|
|
|
|
- glib (calls glib-config)
|
2000-01-14 20:51:19 +00:00
|
|
|
+ glib (calls glib12-config)
|
1999-01-14 16:59:34 +00:00
|
|
|
idl (to be used with orbit-idl)
|
1998-09-06 06:34:19 +00:00
|
|
|
gnome
|
|
|
|
gnomeui
|
1998-09-30 13:51:46 +00:00
|
|
|
gnorba
|
1998-09-06 06:34:19 +00:00
|
|
|
- gtk (calls gtk-config)
|
2000-01-14 20:51:19 +00:00
|
|
|
+ gtk (calls gtk12-config)
|
1998-09-06 06:34:19 +00:00
|
|
|
gtkxmhtml (only --libs)
|
|
|
|
zvt (only --libs)
|
|
|
|
|
1999-01-14 16:59:34 +00:00
|
|
|
If LIBRARY is none of these,
|
|
|
|
|
|
|
|
- ${libdir}/<LIBRARY>Conf.sh
|
1999-03-09 01:13:40 +00:00
|
|
|
+ ${sysconfdir}/<LIBRARY>Conf.sh
|
2000-01-14 20:51:19 +00:00
|
|
|
+and /usr/local/etc/<LIBRARY>Conf.sh
|
1999-03-09 01:13:40 +00:00
|
|
|
|
2000-01-14 20:51:19 +00:00
|
|
|
-is looked in for the necessary information. Those currently installed
|
|
|
|
+are looked in for the necessary information. Those currently installed
|
1999-03-09 01:13:40 +00:00
|
|
|
appear to be:
|
2000-01-14 20:51:19 +00:00
|
|
|
|
|
|
|
EOF
|
|
|
|
@@ -161,19 +162,19 @@
|
1999-01-14 16:59:34 +00:00
|
|
|
usage 1
|
|
|
|
;;
|
|
|
|
glib)
|
|
|
|
- the_libs="$the_libs `glib-config --libs`"
|
|
|
|
- the_flags="$the_flags `glib-config --cflags`"
|
1999-10-18 03:47:31 +00:00
|
|
|
+ the_libs="$the_libs `glib12-config --libs`"
|
|
|
|
+ the_flags="$the_flags `glib12-config --cflags`"
|
1998-09-06 06:34:19 +00:00
|
|
|
;;
|
1999-03-09 01:13:40 +00:00
|
|
|
gtk)
|
1998-09-06 06:34:19 +00:00
|
|
|
- the_libs="$the_libs `gtk-config --libs`"
|
|
|
|
- the_flags="$the_flags `gtk-config --cflags`"
|
1999-10-18 03:47:31 +00:00
|
|
|
+ the_libs="$the_libs `gtk12-config --libs`"
|
|
|
|
+ the_flags="$the_flags `gtk12-config --cflags`"
|
1998-09-06 06:34:19 +00:00
|
|
|
;;
|
|
|
|
gnome)
|
1999-05-30 04:02:08 +00:00
|
|
|
the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
|
1999-01-14 16:59:34 +00:00
|
|
|
the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
|
1998-11-19 15:06:59 +00:00
|
|
|
;;
|
|
|
|
gnomeui)
|
1999-01-14 16:59:34 +00:00
|
|
|
- the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
|
2000-02-16 03:00:03 +00:00
|
|
|
+ the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lungif @GNOMEUI_LIBS@"
|
1999-01-14 16:59:34 +00:00
|
|
|
the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
|
1998-11-19 15:06:59 +00:00
|
|
|
;;
|
|
|
|
gtkxmhtml)
|