sascha 00/01/16 10:20:57
Modified: src/lib/apr configure.in
Log:
Inherit thread flags from Apache
Revision Changes Path
1.43 +8 -10 apache-2.0/src/lib/apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/apr/configure.in,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -u -r1.42 -r1.43
--- configure.in 2000/01/11 12:59:34 1.42
+++ configure.in 2000/01/16 18:20:57 1.43
@@ -32,6 +32,13 @@
# This macro needs to be here in case we are on an AIX box.
AC_AIX
+dnl inherit REENTRANCY_FLAGS
+test -n "$ac_cv_pass_REENTRANCY_CFLAGS" && \
+CFLAGS="$CFLAGS $ac_cv_pass_REENTRANCY_CFLAGS"
+
+test -n "$ac_cv_pass_REENTRANCY_LDFLAGS" && \
+LDFLAGS="$LDFLAGS $ac_cv_pass_REENTRANCY_LDFLAGS"
+
AC_CACHE_CHECK([for threads], ac_cv_enable_threads,
[ AC_ARG_ENABLE(threads,
[ --enable-threads Enable threading support in APR.],
@@ -69,21 +76,14 @@
pthreadser="0"
if test "$threads" = "1"; then
AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h)
- AC_CHECK_LIB(pthread, pthread_mutex_init, [
+ AC_CHECK_FUNC(pthread_mutex_init, [
AC_DEFINE(USE_PTHREAD_SERIALIZE)
pthreadser="1" ])
- AC_CHECK_LIB(c_r, pthread_mutex_init, [
- AC_DEFINE(USE_PTHREAD_SERIALIZE)
- pthreadser="1"])
fi
AC_ARG_WITH(debug,[ --with-debug Turn on debugging and compile
time warnings],
[if test "$GCC" = "yes"; then CFLAGS="$CFLAGS -g -Wall"; else
CFLAGS="$CFLAGS -g"; fi])
-dnl inherit REENTRANCY_FLAGS
-test -n "$ac_cv_pass_REENTRANCY_FLAGS" && \
-CFLAGS="$CFLAGS $ac_cv_pass_REENTRANCY_FLAGS"
-
dnl # this is the place to put specific options for platform/compiler
dnl # combinations
case "$OS:$CC" in
@@ -221,8 +221,6 @@
esac
AC_CHECK_LIB(dl, dlopen)
-AC_CHECK_LIB(pthread, pthread_mutex_init)
-AC_CHECK_LIB(c_r, pthread_mutex_init)
AC_CHECK_LIB(socket,socket)
AC_CHECK_LIB(crypt,crypt)
AC_CHECK_LIB(ufc,crypt)
