summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2021-12-15 22:57:52 +0900
committerNIIBE Yutaka <gniibe@fsij.org>2021-12-15 22:57:52 +0900
commitf5e043ad271f431f2c35fc6b22fc51b448507b01 (patch)
treeb436bafa08a1d92df1ca50aecf32f402fc527e8b /m4
parentf15c06951bb91eb0a4ab54f6707b6e21448945f9 (diff)
downloadlibgpg-error-f5e043ad271f431f2c35fc6b22fc51b448507b01.tar.gz
build: Update configure.ac for newer autoconf.
* configure.ac (AC_PREREQ): Require 2.69 or later. (AC_CONFIG_HEADERS): Replace AC_CONFIG_HEADER. (AC_HEADER_STDC): Remove. * m4/codeset.m4: Update from gnulib. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'm4')
-rw-r--r--m4/codeset.m419
1 files changed, 11 insertions, 8 deletions
diff --git a/m4/codeset.m4 b/m4/codeset.m4
index a6e67ec..629f4ee 100644
--- a/m4/codeset.m4
+++ b/m4/codeset.m4
@@ -1,5 +1,6 @@
-# codeset.m4 serial AM1 (gettext-0.10.40)
-dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+# codeset.m4 serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2021 Free Software
+dnl 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.
@@ -8,14 +9,16 @@ 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);],
- am_cv_langinfo_codeset=yes,
- am_cv_langinfo_codeset=no)
+ AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
+ [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,
+ AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
fi
])