From 3865bfc16c1e9c15d901531c68c831e5538b2ff4 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 25 Aug 2023 09:28:25 +0100
Subject: [PATCH 1/3] autoconf: Use AS_HELP_STRING if available, fixes warnings
 for any recent version of autoconf.

---
 acinclude.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/acinclude.m4 b/acinclude.m4
index c40cbd2304b..0216f4297e6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -4,7 +4,7 @@ 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 Note: this define must be on one line so that it can be properly returned
 dnl as the help string.
-AC_DEFUN([APACHE_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[  ]$1 substr([                       ],len($1))$2)])dnl
+AC_DEFUN([APACHE_HELP_STRING],[ifdef([AS_HELP_STRING], AS_HELP_STRING($1, $2),[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING($1,$2),[  ]$1 substr([                       ],len($1))$2)])])dnl
 
 dnl APACHE_SUBST(VARIABLE)
 dnl Makes VARIABLE available in generated files

From 429c7b38de669bcfdabbf8d4fdde3fd7860034d1 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 25 Aug 2023 09:29:11 +0100
Subject: [PATCH 2/3] configure: Fix autoconf warnings.

---
 configure.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure.in b/configure.in
index 719f8ac5c30..e308e21188b 100644
--- a/configure.in
+++ b/configure.in
@@ -429,8 +429,6 @@ AC_AIX
 AC_MINIX
 ])
 
-AC_ISC_POSIX
-
 # Ensure that satisfactory versions of apr and apr-util are 
 # found if external copies are configured.
 if test "${apr_found}" = "yes"; then
@@ -738,7 +736,7 @@ if test "$enable_pie" = "yes"; then
      PICFLAGS="-fPIE"
      PILDFLAGS="-pie"
    else
-     AC_ERROR([--enable-pie requested but $CC failed using PIE flags])
+     AC_MSG_ERROR([--enable-pie requested but $CC failed using PIE flags])
    fi
 fi
 APACHE_SUBST(PICFLAGS)

From 4613d9fe7823ec4340bfca2a48dd763100246839 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Fri, 25 Aug 2023 09:30:41 +0100
Subject: [PATCH 3/3] * acinclude.m4 (APACHE_CHECK_OPENSSL): Use
 AC_CACHE_CHECK/AC_COMPILE_IFELSE   to fix autoconf warnings.

---
 acinclude.m4 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 0216f4297e6..46c515d9143 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -585,17 +585,17 @@ AC_DEFUN([APACHE_CHECK_OPENSSL],[
       fi
     fi
 
-    AC_MSG_CHECKING([for OpenSSL version >= 0.9.8a])
-    AC_TRY_COMPILE([#include <openssl/opensslv.h>],[
+    AC_CACHE_CHECK([for OpenSSL version >= 0.9.8a], [ap_cv_openssl098a], [
+    AC_COMPILE_IFELSE(AC_LANG_PROGRAM([#include <openssl/opensslv.h>],[
 #if !defined(OPENSSL_VERSION_NUMBER)
 #error "Missing OpenSSL version"
 #endif
 #if OPENSSL_VERSION_NUMBER < 0x0090801f
 #error "Unsupported OpenSSL version " OPENSSL_VERSION_TEXT
-#endif],
-      [AC_MSG_RESULT(yes)
-       ac_cv_openssl=yes],
-      [AC_MSG_RESULT(no)])
+#endif]), [ap_cv_openssl098a=yes], [ap_cv_openssl098a=no])])
+    if test "x$ap_cv_openssl098a" = xyes; then
+       ac_cv_openssl=yes
+    fi
 
     if test "x$ac_cv_openssl" = "xyes"; then
       ap_openssl_libs="${ap_openssl_libs:--lssl -lcrypto} `$apr_config --libs`"