diff options
Diffstat (limited to 'build/ac-macros/apr_memcache.m4')
| -rw-r--r-- | build/ac-macros/apr_memcache.m4 | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/build/ac-macros/apr_memcache.m4 b/build/ac-macros/apr_memcache.m4 index 384a0e0..3473864 100644 --- a/build/ac-macros/apr_memcache.m4 +++ b/build/ac-macros/apr_memcache.m4 @@ -48,41 +48,26 @@ AC_DEFUN(SVN_LIB_APR_MEMCACHE, CPPFLAGS="$save_cppflags" fi ], [ - if test -d "$srcdir/apr_memcache"; then - apr_memcache_found=reconfig - else dnl Try just looking in apr-util (>= 1.3 has it already). - AC_MSG_NOTICE([looking for apr_memcache as part of apr-util]) - save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES" - AC_CHECK_HEADER(apr_memcache.h,[ - save_ldflags="$LDFLAGS" - LDFLAGS="$LDFLAGS $SVN_APRUTIL_LIBS" - AC_CHECK_LIB(aprutil-1, apr_memcache_create, - [apr_memcache_found="aprutil"]) - LDFLAGS="$save_ldflags"]) - CPPFLAGS="$save_cppflags" - - fi + AC_MSG_NOTICE([looking for apr_memcache as part of apr-util]) + save_cppflags="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES $SVN_APRUTIL_INCLUDES" + AC_CHECK_HEADER(apr_memcache.h,[ + save_ldflags="$LDFLAGS" + LDFLAGS="$LDFLAGS $SVN_APRUTIL_LIBS" + AC_CHECK_LIB(aprutil-1, apr_memcache_create, + [apr_memcache_found="aprutil"]) + LDFLAGS="$save_ldflags"]) + CPPFLAGS="$save_cppflags" ]) - if test $apr_memcache_found = "reconfig"; then - SVN_EXTERNAL_PROJECT([apr_memcache], [--with-apr=$apr_config --with-apr-util=$apu_config]) - apr_memcache_prefix=$prefix - SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix" - SVN_APR_MEMCACHE_INCLUDES="-I$srcdir/memcache" - SVN_APR_MEMCACHE_LIBS="$abs_builddir/memcache/libapr_memcache.la" - fi - if test $apr_memcache_found = "standalone"; then - SVN_APR_MEMCACHE_PREFIX="$apr_memcache_prefix" SVN_APR_MEMCACHE_INCLUDES="-I$apr_memcache_prefix/include/apr_memcache-0" SVN_APR_MEMCACHE_LIBS="$apr_memcache_prefix/lib/libapr_memcache.la" svn_lib_apr_memcache=yes elif test $apr_memcache_found = "aprutil"; then dnl We are already linking apr-util everywhere, so no special treatement needed. - SVN_APR_MEMCACHE_PREFIX="" SVN_APR_MEMCACHE_INCLUDES="" SVN_APR_MEMCACHE_LIBS="" svn_lib_apr_memcache=yes @@ -92,7 +77,6 @@ dnl We are already linking apr-util everywhere, so no special treatement needed. svn_lib_apr_memcache=no fi - AC_SUBST(SVN_APR_MEMCACHE_PREFIX) AC_SUBST(SVN_APR_MEMCACHE_INCLUDES) AC_SUBST(SVN_APR_MEMCACHE_LIBS) ]) |