58 lines
1.6 KiB
Text
58 lines
1.6 KiB
Text
--- gnome-config.in.orig Mon May 31 06:04:01 1999
|
|
+++ gnome-config.in Mon Jul 12 10:27:28 1999
|
|
@@ -19,7 +19,7 @@
|
|
pkglibdir=${libdir}/@PACKAGE@
|
|
pkgincludedir=${includedir}/@PACKAGE@
|
|
MODULE_VERSION=@PACKAGE@-@VERSION@
|
|
-module_dirs="$libdir:$GNOME_LIBCONFIG_PATH"
|
|
+module_dirs="$sysconfdir:$GNOME_LIBCONFIG_PATH"
|
|
|
|
usage()
|
|
{
|
|
@@ -46,18 +46,18 @@
|
|
|
|
Known values for LIBRARY are:
|
|
|
|
- glib (calls glib-config)
|
|
+ glib (calls GLIB_CONFIG)
|
|
idl (to be used with orbit-idl)
|
|
gnome
|
|
gnomeui
|
|
gnorba
|
|
- gtk (calls gtk-config)
|
|
+ gtk (calls GTK_CONFIG)
|
|
gtkxmhtml (only --libs)
|
|
zvt (only --libs)
|
|
|
|
If LIBRARY is none of these,
|
|
|
|
- ${libdir}/<LIBRARY>Conf.sh
|
|
+ ${sysconfdir}/<LIBRARY>Conf.sh
|
|
|
|
is looked in for the necessary information. Those currently installed
|
|
appear to be:
|
|
@@ -149,19 +149,19 @@
|
|
usage 1
|
|
;;
|
|
glib)
|
|
- the_libs="$the_libs `glib-config --libs`"
|
|
- the_flags="$the_flags `glib-config --cflags`"
|
|
+ the_libs="$the_libs `$GLIB_CONFIG --libs`"
|
|
+ the_flags="$the_flags `$GLIB_CONFIG --cflags`"
|
|
;;
|
|
gtk)
|
|
- the_libs="$the_libs `gtk-config --libs`"
|
|
- the_flags="$the_flags `gtk-config --cflags`"
|
|
+ the_libs="$the_libs `$GTK_CONFIG --libs`"
|
|
+ the_flags="$the_flags `$GTK_CONFIG --cflags`"
|
|
;;
|
|
gnome)
|
|
the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@"
|
|
the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
|
|
;;
|
|
gnomeui)
|
|
- the_libs="$the_libs @GNOME_LIBDIR@ @GNOMEUI_LIBS@"
|
|
+ the_libs="$the_libs @GNOME_LIBDIR@ -lXpm -ljpeg -lpng -lz -ltiff -lgif @GNOMEUI_LIBS@"
|
|
the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
|
|
;;
|
|
gtkxmhtml)
|