From: Owen Taylor <otaylor@redhat.com>
Date: Wed, 11 Dec 2002 22:51:37 +0000 (+0000)
Subject: Unset ac_cv_func_bind_textdomain_codeset before calling
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0aa7b51ef36a5debf8406548004ab6631d351fc1;p=dana%2Fcg-glib.git

Unset ac_cv_func_bind_textdomain_codeset before calling

Wed Dec 11 17:49:15 2002  Owen Taylor  <otaylor@redhat.com>

        * m4macros/glib-gettext.m4: Unset
        ac_cv_func_bind_textdomain_codeset before calling
        AC_CHECK_FUNCS(bind_textdomain_codeset) again.

        * configure.in: Remove duplicate call to
        AC_CHECK_FUNCS(bind_textdomain_codeset)
---

diff --git a/configure.in b/configure.in
index cd42896f..4ab8d132 100644
--- a/configure.in
+++ b/configure.in
@@ -351,8 +351,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
 
 GLIB_DEFINE_LOCALEDIR(GLIB_LOCALE_DIR)
 
-AC_CHECK_FUNCS(bind_textdomain_codeset)
-
 dnl
 dnl Now we are done with gettext checks, figure out ICONV_LIBS
 dnl
diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4
index d52c20b8..c8b4b989 100644
--- a/m4macros/glib-gettext.m4
+++ b/m4macros/glib-gettext.m4
@@ -137,6 +137,7 @@ glib_DEFUN([GLIB_WITH_NLS],
         if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
           glib_save_LIBS="$LIBS"
           LIBS="$LIBS -lintl $libintl_extra_libs"
+          unset ac_cv_func_bind_textdomain_codeset
           AC_CHECK_FUNCS(bind_textdomain_codeset)
           LIBS="$glib_save_LIBS"