[rs-commit] r231 - in /mod_ca/trunk: configure configure.ac
rs-commit at redwax.eu
rs-commit at redwax.eu
Sat Jan 4 21:23:34 CET 2020
Author: minfrin at redwax.eu
Date: Sat Jan 4 21:23:33 2020
New Revision: 231
Log:
Go one back on the requirements for APR versions.
Modified:
mod_ca/trunk/configure
mod_ca/trunk/configure.ac
Modified: mod_ca/trunk/configure
==============================================================================
--- mod_ca/trunk/configure (original)
+++ mod_ca/trunk/configure Sat Jan 4 21:23:33 2020
@@ -4226,19 +4226,19 @@
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr-1 >= 1.4" >&5
-$as_echo_n "checking for apr-1 >= 1.4... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr-1 >= 1.3" >&5
+$as_echo_n "checking for apr-1 >= 1.3... " >&6; }
if test -n "$apr_CFLAGS"; then
pkg_cv_apr_CFLAGS="$apr_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"apr-1 >= 1.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "apr-1 >= 1.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"apr-1 >= 1.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "apr-1 >= 1.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_apr_CFLAGS=`$PKG_CONFIG --cflags "apr-1 >= 1.4" 2>/dev/null`
+ pkg_cv_apr_CFLAGS=`$PKG_CONFIG --cflags "apr-1 >= 1.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -4250,12 +4250,12 @@
pkg_cv_apr_LIBS="$apr_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"apr-1 >= 1.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "apr-1 >= 1.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"apr-1 >= 1.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "apr-1 >= 1.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_apr_LIBS=`$PKG_CONFIG --libs "apr-1 >= 1.4" 2>/dev/null`
+ pkg_cv_apr_LIBS=`$PKG_CONFIG --libs "apr-1 >= 1.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -4276,14 +4276,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- apr_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "apr-1 >= 1.4" 2>&1`
+ apr_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "apr-1 >= 1.3" 2>&1`
else
- apr_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "apr-1 >= 1.4" 2>&1`
+ apr_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "apr-1 >= 1.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$apr_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (apr-1 >= 1.4) were not met:
+ as_fn_error $? "Package requirements (apr-1 >= 1.3) were not met:
$apr_PKG_ERRORS
@@ -4317,19 +4317,19 @@
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr-util-1 >= 1.4" >&5
-$as_echo_n "checking for apr-util-1 >= 1.4... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for apr-util-1 >= 1.3" >&5
+$as_echo_n "checking for apr-util-1 >= 1.3... " >&6; }
if test -n "$apu_CFLAGS"; then
pkg_cv_apu_CFLAGS="$apu_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"apr-util-1 >= 1.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "apr-util-1 >= 1.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"apr-util-1 >= 1.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "apr-util-1 >= 1.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_apu_CFLAGS=`$PKG_CONFIG --cflags "apr-util-1 >= 1.4" 2>/dev/null`
+ pkg_cv_apu_CFLAGS=`$PKG_CONFIG --cflags "apr-util-1 >= 1.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -4341,12 +4341,12 @@
pkg_cv_apu_LIBS="$apu_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"apr-util-1 >= 1.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "apr-util-1 >= 1.4") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"apr-util-1 >= 1.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "apr-util-1 >= 1.3") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_apu_LIBS=`$PKG_CONFIG --libs "apr-util-1 >= 1.4" 2>/dev/null`
+ pkg_cv_apu_LIBS=`$PKG_CONFIG --libs "apr-util-1 >= 1.3" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -4367,14 +4367,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- apu_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "apr-util-1 >= 1.4" 2>&1`
+ apu_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "apr-util-1 >= 1.3" 2>&1`
else
- apu_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "apr-util-1 >= 1.4" 2>&1`
+ apu_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "apr-util-1 >= 1.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$apu_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (apr-util-1 >= 1.4) were not met:
+ as_fn_error $? "Package requirements (apr-util-1 >= 1.3) were not met:
$apu_PKG_ERRORS
Modified: mod_ca/trunk/configure.ac
==============================================================================
--- mod_ca/trunk/configure.ac (original)
+++ mod_ca/trunk/configure.ac Sat Jan 4 21:23:33 2020
@@ -49,8 +49,8 @@
fi
# Checks for libraries.
-PKG_CHECK_MODULES(apr, apr-1 >= 1.4)
-PKG_CHECK_MODULES(apu, apr-util-1 >= 1.4)
+PKG_CHECK_MODULES(apr, apr-1 >= 1.3)
+PKG_CHECK_MODULES(apu, apr-util-1 >= 1.3)
PKG_CHECK_MODULES([openssl], [openssl >= 0.9.8])
LDFLAGS="$LDFLAGS $openssl_LIBS $apr_LIBS $apu_LIBS"
More information about the rs-commit
mailing list