X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcodeset.m4;h=55f50a13d634a06a2bec2ac3e25a81f2d25db6ab;hb=ad7e0cc967251bc0d09999503a51e5fbcfac021d;hp=6f0b58e09d6afc74f931e2afb6dee5c916d168ff;hpb=f74b847e710af94304d0ea21c1e8b57e866e2f1e;p=gnulib.git

diff --git a/m4/codeset.m4 b/m4/codeset.m4
index 6f0b58e09..55f50a13d 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,16 +1,20 @@
-#serial 1
+# codeset.m4 serial 2 (gettext-0.15.1)
+dnl Copyright (C) 2000-2002, 2006 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_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
+  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