diff options
Diffstat (limited to 'build/ac-macros/apr.m4')
| -rw-r--r-- | build/ac-macros/apr.m4 | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/build/ac-macros/apr.m4 b/build/ac-macros/apr.m4 index 6085717..49774ba 100644 --- a/build/ac-macros/apr.m4 +++ b/build/ac-macros/apr.m4 @@ -32,7 +32,7 @@ AC_DEFUN(SVN_LIB_APR, AC_MSG_NOTICE([Apache Portable Runtime (APR) library configuration]) - APR_FIND_APR("$abs_srcdir/apr", "$abs_builddir/apr", 1, [1 0]) + APR_FIND_APR("", "", 1, [1 0]) if test $apr_found = "no"; then AC_MSG_WARN([APR not found]) @@ -40,7 +40,7 @@ AC_DEFUN(SVN_LIB_APR, fi if test $apr_found = "reconfig"; then - SVN_EXTERNAL_PROJECT([apr]) + AC_MSG_ERROR([Unexpected APR reconfig]) fi dnl check APR version number against regex @@ -88,11 +88,6 @@ AC_DEFUN(SVN_LIB_APR, AC_MSG_ERROR([apr-config --includes failed]) fi - SVN_APR_PREFIX="`$apr_config --prefix`" - if test $? -ne 0; then - AC_MSG_ERROR([apr-config --prefix failed]) - fi - if test "$enable_all_static" = "yes"; then SVN_APR_LIBS="`$apr_config --link-ld --libs`" if test $? -ne 0; then @@ -111,7 +106,6 @@ AC_DEFUN(SVN_LIB_APR, AC_MSG_ERROR([apr-config --shlib-path-var failed]) fi - AC_SUBST(SVN_APR_PREFIX) AC_SUBST(SVN_APR_CONFIG, ["$apr_config"]) AC_SUBST(SVN_APR_INCLUDES) AC_SUBST(SVN_APR_LIBS) @@ -123,29 +117,12 @@ dnl no apr found, print out a message telling the user what to do AC_DEFUN(SVN_DOWNLOAD_APR, [ echo "The Apache Portable Runtime (APR) library cannot be found." - echo "Please install APR on this system and supply the appropriate" - echo "--with-apr option to 'configure'" - echo "" - echo "or" - echo "" - echo "get it with SVN and put it in a subdirectory of this source:" - echo "" - echo " svn co \\" - echo " http://svn.apache.org/repos/asf/apr/apr/branches/1.3.x \\" - echo " apr" - echo "" - echo "Run that right here in the top level of the Subversion tree." - echo "Afterwards, run apr/buildconf in that subdirectory and" - echo "then run configure again here." - echo "" - echo "Whichever of the above you do, you probably need to do" - echo "something similar for apr-util, either providing both" - echo "--with-apr and --with-apr-util to 'configure', or" - echo "getting both from SVN with:" + echo "Please install APR on this system and configure Subversion" + echo "with the appropriate --with-apr option." echo "" - echo " svn co \\" - echo " http://svn.apache.org/repos/asf/apr/apr-util/branches/1.3.x \\" - echo " apr-util" + echo "You probably need to do something similar with the Apache" + echo "Portable Runtime Utility (APRUTIL) library and then configure" + echo "Subversion with both the --with-apr and --with-apr-util options." echo "" - AC_MSG_ERROR([no suitable apr found]) + AC_MSG_ERROR([no suitable APR found]) ]) |