From ba0c0d91f7eee8762728af5e0a43ed2ec17ef5d8 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 7 Aug 2003 19:10:41 +0000 Subject: [PATCH] Set $LIBS to include -lintl when checking for dcgettext and Thu Aug 7 15:01:09 2003 Owen Taylor * m4macros/glib-gettext.m4: Set $LIBS to include -lintl when checking for dcgettext and _nl_msg_cat_cntr. (Tim Mooney, #119171) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ m4macros/glib-gettext.m4 | 3 +++ 7 files changed, 39 insertions(+) diff --git a/ChangeLog b/ChangeLog index ceb47c3..dc375a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Aug 7 15:01:09 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Aug 7 15:01:09 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Thu Aug 7 15:01:09 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Aug 7 15:01:09 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Aug 7 15:01:09 2003 Owen Taylor + + * 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 * 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 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Aug 7 15:01:09 2003 Owen Taylor + + * 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 * 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 --- 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 -- 2.7.4