From abb3c8d534ab931f6adeeea73739395ee39ee37f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 26 Feb 2002 19:58:15 +0000 Subject: [PATCH] Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case -lintl depends on -licon. Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib-2.0.pc.in | 2 +- 9 files changed, 41 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a987031dd..c263521a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Feb 26 14:56:31 2002 Owen Taylor + + * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case + -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) + Mon Feb 25 23:01:53 2002 Owen Taylor * configure.in acconfig.h config.h.win32.in diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a987031dd..c263521a2 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Feb 26 14:56:31 2002 Owen Taylor + + * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case + -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) + Mon Feb 25 23:01:53 2002 Owen Taylor * configure.in acconfig.h config.h.win32.in diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a987031dd..c263521a2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Feb 26 14:56:31 2002 Owen Taylor + + * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case + -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) + Mon Feb 25 23:01:53 2002 Owen Taylor * configure.in acconfig.h config.h.win32.in diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index a987031dd..c263521a2 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Tue Feb 26 14:56:31 2002 Owen Taylor + + * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case + -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) + Mon Feb 25 23:01:53 2002 Owen Taylor * configure.in acconfig.h config.h.win32.in diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a987031dd..c263521a2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Feb 26 14:56:31 2002 Owen Taylor + + * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case + -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) + Mon Feb 25 23:01:53 2002 Owen Taylor * configure.in acconfig.h config.h.win32.in diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a987031dd..c263521a2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Feb 26 14:56:31 2002 Owen Taylor + + * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case + -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) + Mon Feb 25 23:01:53 2002 Owen Taylor * configure.in acconfig.h config.h.win32.in diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a987031dd..c263521a2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Feb 26 14:56:31 2002 Owen Taylor + + * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case + -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) + Mon Feb 25 23:01:53 2002 Owen Taylor * configure.in acconfig.h config.h.win32.in diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a987031dd..c263521a2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Feb 26 14:56:31 2002 Owen Taylor + + * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case + -lintl depends on -licon. (Miroslaw Dobrzanski-Neumann #72717) + Mon Feb 25 23:01:53 2002 Owen Taylor * configure.in acconfig.h config.h.win32.in diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in index 7b0d47c1c..28f11b3c8 100644 --- a/glib-2.0.pc.in +++ b/glib-2.0.pc.in @@ -10,5 +10,5 @@ glib_mkenums=glib-mkenums Name: GLib Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -lglib-1.3 @ICONV_LIBS@ @INTLLIBS@ +Libs: -L${libdir} -lglib-1.3 @INTLLIBS@ @ICONV_LIBS@ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include