Set $LIBS to include -lintl when checking for dcgettext and

Thu Aug  7 15:01:09 2003  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: Set $LIBS to include
        -lintl when checking for dcgettext and
        _nl_msg_cat_cntr. (Tim Mooney, #119171)

diff --git a/ChangeLog b/ChangeLog
index ceb47c3..dc375a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug  7 15:01:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4: Set $LIBS to include
+       -lintl when checking for dcgettext and 
+       _nl_msg_cat_cntr. (Tim Mooney, #119171)
+
 Thu Aug  7 14:15:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_idle_source_new): Make the default priority

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ceb47c3..dc375a9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Aug  7 15:01:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4: Set $LIBS to include
+       -lintl when checking for dcgettext and 
+       _nl_msg_cat_cntr. (Tim Mooney, #119171)
+
 Thu Aug  7 14:15:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_idle_source_new): Make the default priority

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index ceb47c3..dc375a9 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Thu Aug  7 15:01:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4: Set $LIBS to include
+       -lintl when checking for dcgettext and 
+       _nl_msg_cat_cntr. (Tim Mooney, #119171)
+
 Thu Aug  7 14:15:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_idle_source_new): Make the default priority

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ceb47c3..dc375a9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Aug  7 15:01:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4: Set $LIBS to include
+       -lintl when checking for dcgettext and 
+       _nl_msg_cat_cntr. (Tim Mooney, #119171)
+
 Thu Aug  7 14:15:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_idle_source_new): Make the default priority

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ceb47c3..dc375a9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Aug  7 15:01:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4: Set $LIBS to include
+       -lintl when checking for dcgettext and 
+       _nl_msg_cat_cntr. (Tim Mooney, #119171)
+
 Thu Aug  7 14:15:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_idle_source_new): Make the default priority

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ceb47c3..dc375a9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Aug  7 15:01:09 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * m4macros/glib-gettext.m4: Set $LIBS to include
+       -lintl when checking for dcgettext and 
+       _nl_msg_cat_cntr. (Tim Mooney, #119171)
+
 Thu Aug  7 14:15:44 2003  Owen Taylor  <otaylor@redhat.com>
 
        * glib/gmain.c (g_idle_source_new): Make the default priority

diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index 7886a0c..d17b19a 100644 (file)
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -184,6 +184,8 @@ glib_DEFUN([GLIB_WITH_NLS],
        GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
          [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"
          AC_CHECK_FUNCS(dcgettext)
          AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
          GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
@@ -210,6 +212,7 @@ glib_DEFUN([GLIB_WITH_NLS],
             DATADIRNAME=lib
            ;;
            esac])
+          LIBS="$glib_save_LIBS"
          INSTOBJEXT=.mo
        else
          gt_cv_have_gettext=no