This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 1.3.x in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
commit 57f5eb312d2dfa106fd61cf55e2237e0fe68536b Author: Mark Thomas <[email protected]> AuthorDate: Thu Jul 18 10:37:38 2024 +0100 Fix autoconf warnings --- native/build/tcnative.m4 | 15 ++++++--------- native/configure.ac | 10 ++++++---- xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4 index 6cf7681fc..8ae3e441e 100644 --- a/native/build/tcnative.m4 +++ b/native/build/tcnative.m4 @@ -147,7 +147,7 @@ dnl dnl Configure for the detected openssl toolkit installation, giving dnl preference to "--with-ssl=<path>" if it was specified. dnl -AC_DEFUN(TCN_CHECK_SSL_TOOLKIT,[ +AC_DEFUN([TCN_CHECK_SSL_TOOLKIT],[ AC_MSG_CHECKING(for OpenSSL library) AC_ARG_WITH(ssl, [ --with-ssl[=PATH] Build with OpenSSL [yes|no|path]], @@ -229,12 +229,12 @@ case "$use_openssl" in LIBS="$LIBS $TCN_OPENSSL_LIBS" AC_ARG_ENABLE(openssl-version-check, -[AC_HELP_STRING([--disable-openssl-version-check], +[AS_HELP_STRING([--disable-openssl-version-check], [disable the OpenSSL version check])]) case "$enable_openssl_version_check" in yes|'') AC_MSG_CHECKING(OpenSSL library version >= 1.1.1) - AC_TRY_RUN([ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ #include <stdio.h> #include <openssl/opensslv.h> int main() { @@ -245,14 +245,11 @@ int main() { printf("Require OPENSSL_VERSION_NUMBER 0x1010100f or greater (1.1.1)\n\n"); return (1); } - ], - [AC_MSG_RESULT(ok)], - [AC_MSG_ERROR(Your version of OpenSSL is not compatible with this version of tcnative)], - [AC_MSG_RESULT(assuming target platform has compatible version)]) -;; + ]])],[AC_MSG_RESULT(ok)],[AC_MSG_ERROR(Your version of OpenSSL is not compatible with this version of tcnative)],[AC_MSG_RESULT(assuming target platform has compatible version)]) + ;; no) AC_MSG_RESULT(Skipped OpenSSL version check) -;; + ;; esac AC_MSG_CHECKING(for OpenSSL DSA support) diff --git a/native/configure.ac b/native/configure.ac index 3e3c28f10..39f98c9d7 100644 --- a/native/configure.ac +++ b/native/configure.ac @@ -47,7 +47,7 @@ else fi AC_SUBST(TCN_CONFIG_LOCATION) -AC_CANONICAL_SYSTEM +AC_CANONICAL_TARGET AC_PROG_INSTALL dnl @@ -274,8 +274,10 @@ fi dnl dnl everything is done. MAKEFILES="Makefile" -AC_OUTPUT([ +AC_CONFIG_FILES([ $MAKEFILES - ],[ + ]) +AC_CONFIG_COMMANDS([default],[ TCNATIVE_MAJOR_VERSION=$TCNATIVE_MAJOR_VERSION -]) +],[]) +AC_OUTPUT \ No newline at end of file diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 9d62c639a..b02b5a291 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -45,6 +45,9 @@ <update> Update the minimum version of autoconf for releasing to 2.68. (rjung) </update> + <fix> + Fix the autoconf warnings when creating a release. (markt) + </fix> </changelog> </section> <section name="Changes in 1.3.1"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
