diff options
| author | Owen Taylor <otaylor@gtk.org> | 1998-06-10 23:44:55 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 1998-06-10 23:44:55 +0000 |
| commit | 7086e475e3fc26279f004a6cff69cd4dfbd079b4 (patch) | |
| tree | 0ac4f76502e335e7c96a7d6fea98c6e6a792d72a /gtk-config.in | |
| parent | 6b61461a404b910f9024299fd97fc9cb2423d781 (diff) | |
| download | gdk-pixbuf-7086e475e3fc26279f004a6cff69cd4dfbd079b4.tar.gz | |
glib/* Moved to glib module
Wed Jun 10 19:36:35 1998 Owen Taylor <otaylor@gtk.org>
* glib/* Moved to glib module
* INSTALL Makefile.am acconfig.h autogen.sh configure.in
gtk-config.in gtk.m4 gdk/Makefile.am gtk/Makefile.am
configuration changes for the above:
- Use AM_PATH_GLIB by default to find glib; also accept
a --with-glib option for using an uninstalled glib.
- Put --enable-debug information into config.h so
that we rebuild when it changes. (was in glibconfig.h)
Diffstat (limited to 'gtk-config.in')
| -rw-r--r-- | gtk-config.in | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/gtk-config.in b/gtk-config.in index 6354c7692..7fbddd841 100644 --- a/gtk-config.in +++ b/gtk-config.in @@ -1,5 +1,8 @@ #!/bin/sh +glib_libs=@glib_libs@ +glib_cflags=@glib_cflags@ + prefix=@prefix@ exec_prefix=@exec_prefix@ exec_prefix_set=no @@ -41,11 +44,22 @@ while test $# -gt 0; do --cflags) if test @includedir@ != /usr/include ; then includes=-I@includedir@ + for i in $glib_cflags ; do + if test $i = -I@includedir@ ; then + includes="" + fi + done fi - echo -I@libdir@/glib/include $includes @x_cflags@ + echo -I@libdir@/glib/include $includes @x_cflags@ $glib_cflags ;; --libs) - echo -L@libdir@ @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ -lglib-@LT_RELEASE@ @x_libs@ -lm + libdirs=-L@libdir@ + for i in $glib_libs ; do + if test $i = -I@libdir@ ; then + libdirs="" + fi + done + echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $glib_libs @x_libs@ -lm ;; *) echo "${usage}" 1>&2 |