diff options
| author | Ben Collins-Sussman <sussman@apache.org> | 2002-11-05 22:09:19 +0000 |
|---|---|---|
| committer | Ben Collins-Sussman <sussman@apache.org> | 2002-11-05 22:09:19 +0000 |
| commit | 9f62ade36e2a8cd343d61100e0b0eb33a77833f9 (patch) | |
| tree | eb1fe72f36d285158941ca440411ccd13e082780 /build/find_apr.m4 | |
| parent | efa5eebb4d27ecd19f8028262d06c196ab2a70a7 (diff) | |
| download | apr-9f62ade36e2a8cd343d61100e0b0eb33a77833f9.tar.gz | |
* find_apr.m4: backport a change from svn; favor in-tree over installed apr
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@63999 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/find_apr.m4')
| -rw-r--r-- | build/find_apr.m4 | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/build/find_apr.m4 b/build/find_apr.m4 index a334cc168..90865aeca 100644 --- a/build/find_apr.m4 +++ b/build/find_apr.m4 @@ -73,7 +73,17 @@ AC_DEFUN(APR_FIND_APR, [ build directory, or an apr-config file.]) fi ],[ - if test -n "$3" && test "$3" = "1"; then + dnl if we have a bundled source directory, use it + if test -d "$1"; then + apr_temp_abs_srcdir="`cd $1 && pwd`" + apr_found="reconfig" + if test -n "$2"; then + apr_config="$2/apr-config" + else + apr_config="$1/apr-config" + fi + fi + if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then if apr-config --help > /dev/null 2>&1 ; then apr_found="yes" apr_config="apr-config" @@ -88,25 +98,6 @@ build directory, or an apr-config file.]) done fi fi - dnl if we have a bundled source directory, then we may have more work - if test -d "$1"; then - apr_temp_abs_srcdir="`cd $1 && pwd`" - if test "$apr_found" = "yes" \ - && test "`$apr_config --srcdir`" = "$apr_temp_abs_srcdir"; then - dnl the installed apr-config represents our source directory, so - dnl pretend we didn't see it and just use our bundled source - apr_found="no" - fi - dnl We could not find an apr-config; use the bundled one - if test "$apr_found" = "no"; then - apr_found="reconfig" - if test -n "$2"; then - apr_config="$2/apr-config" - else - apr_config="$1/apr-config" - fi - fi - fi ]) AC_MSG_RESULT($apr_found) |