From: Owen Taylor Date: Tue, 19 Aug 2003 13:45:33 +0000 (+0000) Subject: Add $INTLLIBS to $LIBS temporarily, not -lintl. (Problem with fix for X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=9d8e67597cfc2b502045c3dede01768af195883d;p=dana%2Fcg-glib.git Add $INTLLIBS to $LIBS temporarily, not -lintl. (Problem with fix for Tue Aug 19 09:42:06 2003 Owen Taylor * m4macros/glib-gettext.m4: Add $INTLLIBS to $LIBS temporarily, not -lintl. (Problem with fix for #119171, pointed out by James Henstridge) --- diff --git a/ChangeLog b/ChangeLog index f8bee753..dd004567 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Aug 19 09:42:06 2003 Owen Taylor + + * m4macros/glib-gettext.m4: Add $INTLLIBS to $LIBS + temporarily, not -lintl. (Problem with fix for + #119171, pointed out by James Henstridge) + Tue Aug 19 03:55:29 2003 Tim Janik * glib/gbsearcharray.h: license change, no restrictions are made diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f8bee753..dd004567 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Tue Aug 19 09:42:06 2003 Owen Taylor + + * m4macros/glib-gettext.m4: Add $INTLLIBS to $LIBS + temporarily, not -lintl. (Problem with fix for + #119171, pointed out by James Henstridge) + Tue Aug 19 03:55:29 2003 Tim Janik * glib/gbsearcharray.h: license change, no restrictions are made diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index f8bee753..dd004567 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Tue Aug 19 09:42:06 2003 Owen Taylor + + * m4macros/glib-gettext.m4: Add $INTLLIBS to $LIBS + temporarily, not -lintl. (Problem with fix for + #119171, pointed out by James Henstridge) + Tue Aug 19 03:55:29 2003 Tim Janik * glib/gbsearcharray.h: license change, no restrictions are made diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f8bee753..dd004567 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Tue Aug 19 09:42:06 2003 Owen Taylor + + * m4macros/glib-gettext.m4: Add $INTLLIBS to $LIBS + temporarily, not -lintl. (Problem with fix for + #119171, pointed out by James Henstridge) + Tue Aug 19 03:55:29 2003 Tim Janik * glib/gbsearcharray.h: license change, no restrictions are made diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f8bee753..dd004567 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Tue Aug 19 09:42:06 2003 Owen Taylor + + * m4macros/glib-gettext.m4: Add $INTLLIBS to $LIBS + temporarily, not -lintl. (Problem with fix for + #119171, pointed out by James Henstridge) + Tue Aug 19 03:55:29 2003 Tim Janik * glib/gbsearcharray.h: license change, no restrictions are made diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f8bee753..dd004567 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Tue Aug 19 09:42:06 2003 Owen Taylor + + * m4macros/glib-gettext.m4: Add $INTLLIBS to $LIBS + temporarily, not -lintl. (Problem with fix for + #119171, pointed out by James Henstridge) + Tue Aug 19 03:55:29 2003 Tim Janik * glib/gbsearcharray.h: license change, no restrictions are made diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 index d17b19a4..862db40a 100644 --- a/m4macros/glib-gettext.m4 +++ b/m4macros/glib-gettext.m4 @@ -185,7 +185,7 @@ glib_DEFUN([GLIB_WITH_NLS], [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" + LIBS="$LIBS $INTLLIBS" AC_CHECK_FUNCS(dcgettext) AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,