Add $INTLLIBS to $LIBS temporarily, not -lintl. (Problem with fix for

Tue Aug 19 09:42:06 2003  Owen Taylor  <otaylor@redhat.com>

        * 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 f8bee75..dd00456 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 19 09:42:06 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * 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  <timj@gtk.org>
 
        * glib/gbsearcharray.h: license change, no restrictions are made

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f8bee75..dd00456 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Aug 19 09:42:06 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * 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  <timj@gtk.org>
 
        * glib/gbsearcharray.h: license change, no restrictions are made

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f8bee75..dd00456 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Tue Aug 19 09:42:06 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * 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  <timj@gtk.org>
 
        * glib/gbsearcharray.h: license change, no restrictions are made

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f8bee75..dd00456 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Aug 19 09:42:06 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * 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  <timj@gtk.org>
 
        * glib/gbsearcharray.h: license change, no restrictions are made

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f8bee75..dd00456 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Aug 19 09:42:06 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * 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  <timj@gtk.org>
 
        * glib/gbsearcharray.h: license change, no restrictions are made

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f8bee75..dd00456 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Aug 19 09:42:06 2003  Owen Taylor  <otaylor@redhat.com>
+ 
+       * 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  <timj@gtk.org>
 
        * glib/gbsearcharray.h: license change, no restrictions are made

diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index d17b19a..862db40 100644 (file)
--- 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,