X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcodeset.m4;h=a53c04260c0f5c1c347210fb7eb7e4ff63b41cb1;hb=8308b9eb6f9aac709f37c0ef5bd136ec9effe0ad;hp=fbe6a80d3a1cbdc09feedfa4da7615efcf68718c;hpb=cfeec0749797616c7356b28f1a385fae73f86742;p=gnulib.git

diff --git a/m4/codeset.m4 b/m4/codeset.m4
index fbe6a80d3..a53c04260 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,20 +1,21 @@
-#serial 2
+# codeset.m4 serial 4 (gettext-0.18)
+dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
-AC_DEFUN(jm_LANGINFO_CODESET,
+AC_DEFUN([AM_LANGINFO_CODESET],
 [
-  AC_CHECK_HEADERS(langinfo.h)
-  AC_CHECK_FUNCS(nl_langinfo)
-
-  AC_CACHE_CHECK([for nl_langinfo and CODESET], jm_cv_langinfo_codeset,
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
     [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET);],
-      jm_cv_langinfo_codeset=yes,
-      jm_cv_langinfo_codeset=no)
+      [char* cs = nl_langinfo(CODESET); return !cs;],
+      [am_cv_langinfo_codeset=yes],
+      [am_cv_langinfo_codeset=no])
     ])
-  if test $jm_cv_langinfo_codeset = yes; then
-    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
       [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
   fi
 ])