From 3d27110964726f08c92b126ffaedceac401ff569 Mon Sep 17 00:00:00 2001 From: Stefan Berger Date: Wed, 23 Jun 2021 13:13:26 -0400 Subject: [PATCH] build-sys: Run autoupdate on configure.ac for autoconf 2.71 Run autoupdate on configure.ac and address the following issues: configure.ac:10: warning: 'AM_CONFIG_HEADER': this macro is obsolete. configure.ac:10: You should use the 'AC_CONFIG_HEADERS' macro instead. ./lib/autoconf/general.m4:2434: AC_DIAGNOSE is expanded from... aclocal.m4:1071: AM_CONFIG_HEADER is expanded from... configure.ac:10: the top level configure.ac:31: warning: The macro `AC_HELP_STRING' is obsolete. configure.ac:31: You should run autoupdate. ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... configure.ac:31: the top level configure.ac:72: warning: The macro `AC_HELP_STRING' is obsolete. configure.ac:72: You should run autoupdate. ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... configure.ac:72: the top level configure.ac:90: warning: The macro `AC_HELP_STRING' is obsolete. configure.ac:90: You should run autoupdate. ./lib/autoconf/general.m4:204: AC_HELP_STRING is expanded from... configure.ac:90: the top level configure.ac:253: warning: The macro `AC_PROG_LIBTOOL' is obsolete. configure.ac:253: You should run autoupdate. m4/libtool.m4:99: AC_PROG_LIBTOOL is expanded from... configure.ac:253: the top level configure.ac:258: warning: The macro `AC_HEADER_STDC' is obsolete. configure.ac:258: You should run autoupdate. ./lib/autoconf/headers.m4:704: AC_HEADER_STDC is expanded from... configure.ac:258: the top level Signed-off-by: Stefan Berger --- configure.ac | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 551dba18..be2d9ff5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,11 +3,11 @@ # # See the LICENSE file for the license associated with this file. -AC_INIT([libtpms], [0.7.8]) -AC_PREREQ(2.12) +AC_INIT([libtpms],[0.7.8]) +AC_PREREQ([2.69]) AC_CONFIG_SRCDIR(Makefile.am) AC_CONFIG_AUX_DIR([.]) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET @@ -27,7 +27,7 @@ AC_SUBST([LIBTPMS_VERSION_INFO]) DEBUG="" AC_MSG_CHECKING([for debug-enabled build]) -AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [create a debug build]), +AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[create a debug build]), [if test "$enableval" = "yes"; then DEBUG="yes" AC_MSG_RESULT([yes]) @@ -70,8 +70,7 @@ cryptolib=freebl AC_SUBST(cryptolib, $cryptolib) AC_ARG_WITH([openssl], - AC_HELP_STRING([--with-openssl], - [build libtpms with openssl library]), + AS_HELP_STRING([--with-openssl],[build libtpms with openssl library]), [AC_CHECK_LIB(crypto, [AES_set_encrypt_key], [], @@ -134,8 +133,7 @@ openssl) esac AC_ARG_WITH([tpm2], - AC_HELP_STRING([--with-tpm2], - [build libtpms with TPM2 support (experimental)]), + AS_HELP_STRING([--with-tpm2],[build libtpms with TPM2 support (experimental)]), AC_MSG_RESULT([Building with TPM2 support]) if test "x$cryptolib" = "xfreebl"; then AC_MSG_ERROR([TPM2 support requires openssl crypto library]) @@ -241,12 +239,11 @@ LT_INIT AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL -AC_PROG_LIBTOOL +LT_INIT #AM_GNU_GETTEXT_VERSION([0.15]) #AM_GNU_GETTEXT([external]) -AC_HEADER_STDC AC_C_CONST AC_C_INLINE