freebsd-ports/x11/libgnome/files/patch-ac
Ade Lovett d78d6a0392 Allow gnomelibs to DTRT in the case where ${LOCALBASE} is not /usr/local
Original suggestion by:	nectar
Rewritten patch by:	ade (so don't blame nectar for this!)
2000-09-25 21:01:47 +00:00

63 lines
1.8 KiB
Plaintext

--- gnome-config.in.orig Wed Oct 20 07:36:58 1999
+++ gnome-config.in Tue Feb 15 20:50:22 2000
@@ -19,7 +19,7 @@
pkglibdir=${libdir}/@PACKAGE@
pkgincludedir=${includedir}/@PACKAGE@
MODULE_VERSION=@PACKAGE@-@VERSION@
-module_dirs="$libdir"
+module_dirs="$sysconfdir:%%LOCALBASE%%/etc"
# stolen from autoconf
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
@@ -65,20 +65,21 @@
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
+and %%LOCALBASE%%/etc/<LIBRARY>Conf.sh
-is looked in for the necessary information. Those currently installed
+are looked in for the necessary information. Those currently installed
appear to be:
EOF
@@ -161,19 +162,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 -lungif @GNOMEUI_LIBS@"
the_flags="$the_flags @GNOME_INCLUDEDIR@ @GTK_CFLAGS@"
;;
gtkxmhtml)