diff options
| author | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-20 16:30:51 +0000 |
|---|---|---|
| committer | wrowe <wrowe@13f79535-47bb-0310-9956-ffa450edef68> | 2008-06-20 16:30:51 +0000 |
| commit | 5bb79c39aae9c6888143243eb05eee0236a654d8 (patch) | |
| tree | 7532aab16997e8f28e1cd54789dfbc6a091dd52d | |
| parent | 5a0243eac2d9b572ac544ebf968f9e96bf8d6be5 (diff) | |
| download | libapr-5bb79c39aae9c6888143243eb05eee0236a654d8.tar.gz | |
Backport uncontested patched from trunk in case we are ever
motivated to tag and roll 0.9 again.
Silence subpackage autoconf 2.62 warnings of unknown options
Backport: 669950
Silence apr-config.in seems to ignore the --datarootdir setting
Backport: 669954
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@669979 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | apr-config.in | 1 | ||||
| -rw-r--r-- | build/apr_common.m4 | 6 |
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 |