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