diff options
author | Arnold D. Robbins <arnold@skeeve.com> | 2015-08-02 21:30:56 +0300 |
---|---|---|
committer | Arnold D. Robbins <arnold@skeeve.com> | 2015-08-02 21:30:56 +0300 |
commit | c3bb90c5fd1ab7c844253ca9be77974c3ff9f572 (patch) | |
tree | ff44575901fb3d78ba55a74fc1f1cef7ba2d12a8 /m4/codeset.m4 | |
parent | 8e90e97556b42669da322c731091d76db9334c58 (diff) | |
parent | 4d928b409634fa305ccb26975e59ae8ca447cf12 (diff) | |
download | egawk-c3bb90c5fd1ab7c844253ca9be77974c3ff9f572.tar.gz egawk-c3bb90c5fd1ab7c844253ca9be77974c3ff9f572.tar.bz2 egawk-c3bb90c5fd1ab7c844253ca9be77974c3ff9f572.zip |
Merge branch 'master' into feature/cmake
Diffstat (limited to 'm4/codeset.m4')
-rw-r--r-- | m4/codeset.m4 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/m4/codeset.m4 b/m4/codeset.m4 index a53c0426..d7de8d67 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -1,5 +1,5 @@ -# codeset.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 2000-2002, 2006, 2008-2010 Free Software Foundation, Inc. +# codeset.m4 serial 5 (gettext-0.18.2) +dnl Copyright (C) 2000-2002, 2006, 2008-2014 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. @@ -9,10 +9,12 @@ dnl From Bruno Haible. AC_DEFUN([AM_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); return !cs;], - [am_cv_langinfo_codeset=yes], - [am_cv_langinfo_codeset=no]) + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <langinfo.h>]], + [[char* cs = nl_langinfo(CODESET); return !cs;]])], + [am_cv_langinfo_codeset=yes], + [am_cv_langinfo_codeset=no]) ]) if test $am_cv_langinfo_codeset = yes; then AC_DEFINE([HAVE_LANGINFO_CODESET], [1], |