diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | gtk-config.in | 13 |
8 files changed, 58 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org> + + * gtk-config.in: minor changes to gtk-config: --cflags doesn't + prepend -I@libdir@/glib/include anymore, since glib-config handles + it; --libs strips out redundant -L<path>'s properly (there was + code in there to do it before, but it didn't work) + Thu Jul 16 18:24:41 1998 Tim Janik <timj@gtk.org> * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 08e34e3b9..36472dbe0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org> + + * gtk-config.in: minor changes to gtk-config: --cflags doesn't + prepend -I@libdir@/glib/include anymore, since glib-config handles + it; --libs strips out redundant -L<path>'s properly (there was + code in there to do it before, but it didn't work) + Thu Jul 16 18:24:41 1998 Tim Janik <timj@gtk.org> * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 08e34e3b9..36472dbe0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org> + + * gtk-config.in: minor changes to gtk-config: --cflags doesn't + prepend -I@libdir@/glib/include anymore, since glib-config handles + it; --libs strips out redundant -L<path>'s properly (there was + code in there to do it before, but it didn't work) + Thu Jul 16 18:24:41 1998 Tim Janik <timj@gtk.org> * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 08e34e3b9..36472dbe0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org> + + * gtk-config.in: minor changes to gtk-config: --cflags doesn't + prepend -I@libdir@/glib/include anymore, since glib-config handles + it; --libs strips out redundant -L<path>'s properly (there was + code in there to do it before, but it didn't work) + Thu Jul 16 18:24:41 1998 Tim Janik <timj@gtk.org> * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 08e34e3b9..36472dbe0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org> + + * gtk-config.in: minor changes to gtk-config: --cflags doesn't + prepend -I@libdir@/glib/include anymore, since glib-config handles + it; --libs strips out redundant -L<path>'s properly (there was + code in there to do it before, but it didn't work) + Thu Jul 16 18:24:41 1998 Tim Janik <timj@gtk.org> * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 08e34e3b9..36472dbe0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org> + + * gtk-config.in: minor changes to gtk-config: --cflags doesn't + prepend -I@libdir@/glib/include anymore, since glib-config handles + it; --libs strips out redundant -L<path>'s properly (there was + code in there to do it before, but it didn't work) + Thu Jul 16 18:24:41 1998 Tim Janik <timj@gtk.org> * gtk/gtknotebook.h: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 08e34e3b9..36472dbe0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Jul 16 14:16:16 PDT 1998 Manish Singh <yosh@gimp.org> + + * gtk-config.in: minor changes to gtk-config: --cflags doesn't + prepend -I@libdir@/glib/include anymore, since glib-config handles + it; --libs strips out redundant -L<path>'s properly (there was + code in there to do it before, but it didn't work) + Thu Jul 16 18:24:41 1998 Tim Janik <timj@gtk.org> * gtk/gtknotebook.h: diff --git a/gtk-config.in b/gtk-config.in index 26246d70a..7cbc255ff 100644 --- a/gtk-config.in +++ b/gtk-config.in @@ -50,16 +50,21 @@ while test $# -gt 0; do fi done fi - echo -I@libdir@/glib/include $includes @x_cflags@ $glib_cflags + echo $includes @x_cflags@ $glib_cflags ;; --libs) + my_glib_libs= libdirs=-L@libdir@ for i in $glib_libs ; do - if test $i = -I@libdir@ ; then - libdirs="" + if test $i != -L@libdir@ ; then + if test -z "$my_glib_lib" ; then + my_glib_libs="$i" + else + my_glib_libs="$my_glib_libs $i" + fi fi done - echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $glib_libs @x_libs@ -lm + echo $libdirs @x_ldflags@ -lgtk-@LT_RELEASE@ -lgdk-@LT_RELEASE@ $my_glib_libs @x_libs@ -lm ;; *) echo "${usage}" 1>&2 |