You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2005/08/24 14:40:36 UTC
svn commit: r239640 - /apr/apr/trunk/configure.in
Author: jorton
Date: Wed Aug 24 05:40:33 2005
New Revision: 239640
URL: http://svn.apache.org/viewcvs?rev=239640&view=rev
Log:
* configure.in: Check for libefence after threads in case libefence
depends on libpthread.
PR: 34806
Modified:
apr/apr/trunk/configure.in
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/configure.in?rev=239640&r1=239639&r2=239640&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Wed Aug 24 05:40:33 2005
@@ -319,23 +319,6 @@
fi
])
-dnl Electric Fence malloc checker.
-dnl --with-efence specifies the path to Electric Fence
-AC_ARG_WITH(efence,
- [ --with-efence[[=DIR]] path to Electric Fence installation],
- [ apr_efence_dir="$withval"
- if test "$apr_efence_dir" != "yes"; then
- APR_ADDTO(LDFLAGS,[-L$apr_efence_dir/lib])
- if test "x$apr_platform_runtime_link_flag" != "x"; then
- APR_ADDTO(LDFLAGS,
- [$apr_platform_runtime_link_flag$apr_efence_dir/lib])
- fi
- fi
- AC_CHECK_LIB(efence, malloc,
- [ APR_ADDTO(LIBS,-lefence) ],
- [ AC_MSG_ERROR(Electric Fence requested but not detected) ])
- ])
-
if test "$host" = "i586-pc-beos"; then
AC_ARG_ENABLE(malloc-debug,[ --enable-malloc-debug Switch on malloc_debug for BeOS],
APR_REMOVEFROM(CFLAGS, -O2)
@@ -642,6 +625,25 @@
else
echo "APR will be non-threaded"
fi
+
+dnl Electric Fence malloc checker.
+dnl --with-efence specifies the path to Electric Fence.
+dnl This test should remain after the threads checks since libefence
+dnl may depend on libpthread.
+AC_ARG_WITH(efence,
+ [ --with-efence[[=DIR]] path to Electric Fence installation],
+ [ apr_efence_dir="$withval"
+ if test "$apr_efence_dir" != "yes"; then
+ APR_ADDTO(LDFLAGS,[-L$apr_efence_dir/lib])
+ if test "x$apr_platform_runtime_link_flag" != "x"; then
+ APR_ADDTO(LDFLAGS,
+ [$apr_platform_runtime_link_flag$apr_efence_dir/lib])
+ fi
+ fi
+ AC_CHECK_LIB(efence, malloc,
+ [ APR_ADDTO(LIBS,-lefence) ],
+ [ AC_MSG_ERROR(Electric Fence requested but not detected) ])
+ ])
AC_CHECK_FUNCS(sigsuspend, [ have_sigsuspend="1" ], [ have_sigsuspend="0" ])
AC_CHECK_FUNCS(sigwait, [ have_sigwait="1" ], [ have_sigwait="0" ])