You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/06/30 09:07:40 UTC
[tomcat-native] branch main updated: Fix autoconf warnings
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/main by this push:
new 3f64d714e Fix autoconf warnings
3f64d714e is described below
commit 3f64d714ea793f526c922bfbf6823321e686f1dc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 30 10:07:35 2022 +0100
Fix autoconf warnings
---
native/build/tcnative.m4 | 13 +++++--------
native/configure.in | 10 ++++++----
xdocs/miscellaneous/changelog.xml | 3 +++
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4
index 4997968a5..1649d167d 100644
--- a/native/build/tcnative.m4
+++ b/native/build/tcnative.m4
@@ -143,10 +143,10 @@ AC_DEFUN([TCN_FIND_JDK_OS],[
dnl TCN_HELP_STRING(LHS, RHS)
dnl Autoconf 2.50 can not handle substr correctly. It does have
-dnl AC_HELP_STRING, so let's try to call it if we can.
+dnl AS_HELP_STRING, so let's try to call it if we can.
dnl Note: this define must be on one line so that it can be properly returned
dnl as the help string.
-AC_DEFUN(TCN_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl
+AC_DEFUN(TCN_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AS_HELP_STRING($1,$2),[ ]$1 substr([ ],len($1))$2)])dnl
dnl
dnl TCN_FIND_SSL_TOOLKIT
@@ -224,12 +224,12 @@ AC_DEFUN([TCN_FIND_SSL_TOOLKIT],[
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 >= 3.0.0)
- AC_TRY_RUN([
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
#include <stdio.h>
#include <openssl/opensslv.h>
int main() {
@@ -240,10 +240,7 @@ int main() {
printf("Require OPENSSL_VERSION_NUMBER 0x3000000f or greater (3.0.0)\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)
diff --git a/native/configure.in b/native/configure.in
index f7262e9a8..567894b10 100644
--- a/native/configure.in
+++ b/native/configure.in
@@ -47,7 +47,7 @@ else
fi
AC_SUBST(TCN_CONFIG_LOCATION)
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_TARGET
AC_PROG_INSTALL
dnl
@@ -259,8 +259,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
diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index 766f4cfad..219f841d9 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -67,6 +67,9 @@
<docs>
Add HOWTO-RELEASE.txt that describes the release process. (markt)
</docs>
+ <fix>
+ Fix the autoconf warnings when creating a release. (markt)
+ </fix>
</changelog>
</section>
<section name="Changes in 1.2.x">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org