From fd9a7d649e5d6f889276a717149d54b49cbcb0b4 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Mon, 22 Mar 2021 18:17:30 +0100 Subject: [PATCH] configure.ac: Apply partial autoupdate-2.71 Addressed: warning: The macro `AC_CONFIG_HEADER' is obsolete. Not addressed yet: warning: AC_PROG_CC_C99 is obsolete; use AC_PROG_CC --- expat/Changes | 1 + expat/configure.ac | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/expat/Changes b/expat/Changes index e68eb12e..5fbe41a6 100644 --- a/expat/Changes +++ b/expat/Changes @@ -26,6 +26,7 @@ Release x.x.xx xxx xxxxxxx xx xxxx failures, as well. #442 CMake: Call "enable_language(CXX)" prior to tinkering with CMAKE_CXX_* variables + #450 Autotools: Resolve use of obsolete macro AC_CONFIG_HEADER Version info bumped from 7:12:6 to 8:0:7 due to addition of error code XML_ERROR_NO_BUFFER (see https://verbump.de/ for what these numbers do) diff --git a/expat/configure.ac b/expat/configure.ac index 114ef23b..39c718bc 100644 --- a/expat/configure.ac +++ b/expat/configure.ac @@ -11,11 +11,11 @@ dnl in the file COPYING that comes with this distribution. dnl dnl Ensure that Expat is configured with autoconf 2.69 or newer. -AC_PREREQ(2.69) +AC_PREREQ([2.69]) dnl Get the version number of Expat, using m4's esyscmd() command to run dnl the command at m4-generation time. This allows us to create an m4 -dnl symbol holding the correct version number. AC_INIT() requires the +dnl symbol holding the correct version number. AC_INIT requires the dnl version number at m4-time, rather than when ./configure is run, so dnl all this must happen as part of m4, not as part of the shell code dnl contained in ./configure. @@ -27,7 +27,7 @@ m4_define([expat_version], m4_ifdef([__gnu__], [esyscmd(conftools/get-version.sh lib/expat.h)], [2.2.x])) -AC_INIT(expat, expat_version, expat-bugs@libexpat.org) +AC_INIT([expat],[expat_version],[expat-bugs@libexpat.org]) m4_undefine([expat_version]) AC_CONFIG_SRCDIR([Makefile.in]) @@ -53,7 +53,7 @@ LIBREVISION=0 # with LIBAGE=7 # CMakeLists.txt! AX_APPEND_FLAG([-DHAVE_EXPAT_CONFIG_H], [AM_CPPFLAGS]) -AC_CONFIG_HEADER([expat_config.h]) +AC_CONFIG_HEADERS([expat_config.h]) AM_PROG_AR AC_PROG_INSTALL