From 1cac48d3a80ab458b1d5bbd7924910225e98545d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sun, 15 Dec 2002 16:26:58 +0000 Subject: [PATCH] Actually set INTLLIBS when needed. (Reported by Tor Lillqvist) Sun Dec 15 11:24:29 2002 Owen Taylor * m4macros/glib-gettext.m4: Actually set INTLLIBS when needed. (Reported by Tor Lillqvist) --- ChangeLog | 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 +++++ m4macros/glib-gettext.m4 | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0d71df6d..0b927d75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Dec 15 11:24:29 2002 Owen Taylor + + * m4macros/glib-gettext.m4: Actually set INTLLIBS + when needed. (Reported by Tor Lillqvist) + 2002-12-15 Tor Lillqvist * glib/glib.def: Add g_rand_init. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0d71df6d..0b927d75 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Dec 15 11:24:29 2002 Owen Taylor + + * m4macros/glib-gettext.m4: Actually set INTLLIBS + when needed. (Reported by Tor Lillqvist) + 2002-12-15 Tor Lillqvist * glib/glib.def: Add g_rand_init. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 0d71df6d..0b927d75 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Sun Dec 15 11:24:29 2002 Owen Taylor + + * m4macros/glib-gettext.m4: Actually set INTLLIBS + when needed. (Reported by Tor Lillqvist) + 2002-12-15 Tor Lillqvist * glib/glib.def: Add g_rand_init. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0d71df6d..0b927d75 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Dec 15 11:24:29 2002 Owen Taylor + + * m4macros/glib-gettext.m4: Actually set INTLLIBS + when needed. (Reported by Tor Lillqvist) + 2002-12-15 Tor Lillqvist * glib/glib.def: Add g_rand_init. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0d71df6d..0b927d75 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Dec 15 11:24:29 2002 Owen Taylor + + * m4macros/glib-gettext.m4: Actually set INTLLIBS + when needed. (Reported by Tor Lillqvist) + 2002-12-15 Tor Lillqvist * glib/glib.def: Add g_rand_init. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0d71df6d..0b927d75 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Dec 15 11:24:29 2002 Owen Taylor + + * m4macros/glib-gettext.m4: Actually set INTLLIBS + when needed. (Reported by Tor Lillqvist) + 2002-12-15 Tor Lillqvist * glib/glib.def: Add g_rand_init. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0d71df6d..0b927d75 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Dec 15 11:24:29 2002 Owen Taylor + + * m4macros/glib-gettext.m4: Actually set INTLLIBS + when needed. (Reported by Tor Lillqvist) + 2002-12-15 Tor Lillqvist * glib/glib.def: Add g_rand_init. diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 index b54befc6..56acddbf 100644 --- a/m4macros/glib-gettext.m4 +++ b/m4macros/glib-gettext.m4 @@ -95,6 +95,7 @@ glib_DEFUN([GLIB_WITH_NLS], CATOBJEXT=NONE XGETTEXT=: + INTLLIBS= AC_CHECK_HEADER(libintl.h, [gt_cv_func_dgettext_libintl="no" @@ -162,6 +163,10 @@ glib_DEFUN([GLIB_WITH_NLS], gt_cv_have_gettext=yes fi + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + if test "$gt_cv_have_gettext" = "yes"; then AC_DEFINE(HAVE_GETTEXT,1, [Define if the GNU gettext() function is already present or preinstalled.]) -- 2.34.1