Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix autoconf warnings #380

Open
wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

Fix autoconf warnings #380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3865bfc
autoconf: Use AS_HELP_STRING if available, fixes warnings for any recent
notroj Aug 25, 2023
429c7b3
configure: Fix autoconf warnings.
notroj Aug 25, 2023
4613d9f
* acinclude.m4 (APACHE_CHECK_OPENSSL): Use AC_CACHE_CHECK/AC_COMPILE_…
notroj Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions acinclude.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`"
Expand Down
4 changes: 1 addition & 3 deletions configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down