diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 5 | ||||
| -rw-r--r-- | glib-config.in | 17 |
9 files changed, 50 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Wed Dec 16 02:02:48 1998 Tim Janik <timj@gtk.org> + + * glib-config.in (lib_glib): fixed library and flag ordering for + --libs + Tue Dec 15 17:17:46 1998 Owen Taylor <otaylor@redhat.com> * glib.h giounix.c giochannel.c: Use an "inheritance" diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 48223a772..aafb135b4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Wed Dec 16 02:02:48 1998 Tim Janik <timj@gtk.org> + + * glib-config.in (lib_glib): fixed library and flag ordering for + --libs + Tue Dec 15 17:17:46 1998 Owen Taylor <otaylor@redhat.com> * glib.h giounix.c giochannel.c: Use an "inheritance" diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 48223a772..aafb135b4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Dec 16 02:02:48 1998 Tim Janik <timj@gtk.org> + + * glib-config.in (lib_glib): fixed library and flag ordering for + --libs + Tue Dec 15 17:17:46 1998 Owen Taylor <otaylor@redhat.com> * glib.h giounix.c giochannel.c: Use an "inheritance" diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 48223a772..aafb135b4 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Wed Dec 16 02:02:48 1998 Tim Janik <timj@gtk.org> + + * glib-config.in (lib_glib): fixed library and flag ordering for + --libs + Tue Dec 15 17:17:46 1998 Owen Taylor <otaylor@redhat.com> * glib.h giounix.c giochannel.c: Use an "inheritance" diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 48223a772..aafb135b4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Wed Dec 16 02:02:48 1998 Tim Janik <timj@gtk.org> + + * glib-config.in (lib_glib): fixed library and flag ordering for + --libs + Tue Dec 15 17:17:46 1998 Owen Taylor <otaylor@redhat.com> * glib.h giounix.c giochannel.c: Use an "inheritance" diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 48223a772..aafb135b4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Wed Dec 16 02:02:48 1998 Tim Janik <timj@gtk.org> + + * glib-config.in (lib_glib): fixed library and flag ordering for + --libs + Tue Dec 15 17:17:46 1998 Owen Taylor <otaylor@redhat.com> * glib.h giounix.c giochannel.c: Use an "inheritance" diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 48223a772..aafb135b4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Dec 16 02:02:48 1998 Tim Janik <timj@gtk.org> + + * glib-config.in (lib_glib): fixed library and flag ordering for + --libs + Tue Dec 15 17:17:46 1998 Owen Taylor <otaylor@redhat.com> * glib.h giounix.c giochannel.c: Use an "inheritance" diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 48223a772..aafb135b4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Dec 16 02:02:48 1998 Tim Janik <timj@gtk.org> + + * glib-config.in (lib_glib): fixed library and flag ordering for + --libs + Tue Dec 15 17:17:46 1998 Owen Taylor <otaylor@redhat.com> * glib.h giounix.c giochannel.c: Use an "inheritance" diff --git a/glib-config.in b/glib-config.in index 36192c9c9..c36b667d3 100644 --- a/glib-config.in +++ b/glib-config.in @@ -94,15 +94,18 @@ if test "$echo_cflags" = "yes"; then echo -I@libdir@/glib/include $includes $cflags fi if test "$echo_libs" = "yes"; then - libs="" + libsp="" + libsa="" if test "$lib_glib" = "yes"; then - libs="$libs -lglib" - fi - if test "$lib_gmodule" = "yes"; then - libs="@G_MODULE_LDFLAGS@ -lgmodule $libs @G_MODULE_LIBS@" + libsp="$libsp -lglib" fi if test "$lib_gthread" = "yes"; then - libs="-lgthread $libs @G_THREAD_LIBS@" + libsp="-lgthread $libsp" + libsa="$libsa @G_THREAD_LIBS@" + fi + if test "$lib_gmodule" = "yes"; then + libsp="@G_MODULE_LDFLAGS@ -lgmodule $libsp" + libsa="$libsa @G_MODULE_LIBS@" fi - echo -L@libdir@ $libs + echo -L@libdir@ $libsp $libsa fi |