aboutsummaryrefslogtreecommitdiffstats
path: root/x11/gnomelibs/files/patch-ac
blob: 3f491f33865442b3b45586530ffb9635987e5500 (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
54
55
56
57
58
--- 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)