summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apr-config.in1
-rw-r--r--build/apr_common.m46
2 files changed, 7 insertions, 0 deletions
diff --git a/apr-config.in b/apr-config.in
index 156e521de..9eae645d8 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -25,6 +25,7 @@ prefix="@prefix@"
exec_prefix="@exec_prefix@"
bindir="@bindir@"
libdir="@libdir@"
+datarootdir="@datadir@"
datadir="@datadir@"
installbuilddir="@installbuilddir@"
includedir="@includedir@"
diff --git a/build/apr_common.m4 b/build/apr_common.m4
index 77933fc59..ace88c445 100644
--- a/build/apr_common.m4
+++ b/build/apr_common.m4
@@ -138,6 +138,12 @@ changequote([, ])dnl
done
])
+ dnl autoconf doesn't add --silent to ac_configure_args; explicitly pass it
+ test "x$silent" = "xyes" && apr_configure_args="$apr_configure_args --silent"
+
+ dnl AC_CONFIG_SUBDIRS silences option warnings, emulate this for 2.62
+ apr_configure_args="--disable-option-checking $apr_configure_args"
+
dnl The eval makes quoting arguments work - specifically $2 where the
dnl quoting mechanisms used is "" rather than [].
dnl