Move threads/reentrancy m4 macros into threads.m4. All results are now

cached and can be made easily available to Apache and APR.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84475 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index a58629e008d0406b4344af09383ccbde35a63e46..195270220a35e0381612aa6917f868433c7c6666 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -141,69 +141,7 @@ AC_DEFUN(APACHE_ONCE,[
   fi
 ])
 
-dnl
-dnl APACHE_CHECK_THREADS()
-dnl
-dnl Determine the best flags for linking against a threading library.
-dnl
-AC_DEFUN(APACHE_THREAD_TEST, [
-AC_TRY_RUN( [
-#include <pthread.h>
-
-void *thread_routine(void *data) {
-    return data;
-}
-
-int main() {
-    pthread_t thd;
-    int data = 1;
-    return pthread_create(&thd, NULL, thread_routine, &data);
-} ], [ 
-  apache_threads_working="yes"
-  ], [
-  apache_threads_working="no"
-  ], apache_threads_working="no" ) ] )
-
-
-AC_DEFUN(APACHE_CHECK_THREADS,[
-
-APACHE_THREAD_TEST
-
-if test "$apache_threads_working" != "yes"; then
-  for flag in -pthreads -pthread -mthreads; do 
-    AC_MSG_CHECKING(whether $flag enables POSIX threads)
-    ac_save="$CFLAGS"
-    CFLAGS="$CFLAGS $flag"
-    APACHE_THREAD_TEST
-    if test "$apache_threads_working" = "yes"; then
-      AC_MSG_RESULT(yes)
-      REENTRANCY_CFLAGS="$REENTRANCY_CFLAGS $flag"
-      break
-    fi
-    CFLAGS="$ac_save"
-    AC_MSG_RESULT(no)
-  done
-fi
-
-if test "$apache_threads_working" != "yes"; then
-  for lib in pthread pthreads c_r; do
-    ac_save="$LIBS"
-    LIBS="$LIBS -l$lib"
-    APACHE_THREAD_TEST
-    if test "$apache_threads_working" = "yes"; then
-      REENTRANCY_LDFLAGS="$REENTRANCY_LDFLAGS -l$lib"
-      break
-    fi
-    LIBS="$ac_save"
-  done
-fi
-
-if test "$apache_threads_working" = "yes"; then
-  threads_result="POSIX Threads found"
-else
-  threads_result="POSIX Threads not found"
-fi
-])
+sinclude(lib/apr/threads.m4)
 
 dnl
 dnl APACHE_INADDR_NONE

diff --git a/build/build2.mk b/build/build2.mk
index 158972dca9c90bb50bbdebc5ec4d4d2b8ca0e057..87fae8ca4c41f8fa95491dfbc777bd4768e101c6 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -21,7 +21,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 ##############################################################################
-# $Id: build2.mk,v 1.3 2000/01/16 18:20:17 sascha Exp $
+# $Id: build2.mk,v 1.4 2000/01/16 20:00:48 sascha Exp $
 
 include generated_lists
 
@@ -73,6 +73,6 @@ $(apr_config_h_in): $(apr_configure) lib/apr/acconfig.h
        @rm -f $@
        (cd lib/apr && autoheader)
 
-$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in
+$(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in lib/apr/threads.m4
        @echo rebuilding $@
        (cd lib/apr && autoconf)

diff --git a/configure.in b/configure.in
index 0c11bff7ee7bd0974340dd498ade7f20e55a4490..d0cbda7b865ac9152b77c86565649b572410dfc9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -102,14 +102,7 @@ AC_CHECK_FUNCS(inet_addr inet_network, break, [
 
 APACHE_INADDR_NONE
 
-case "`uname -sr`" in
-"SunOS 5"*)
-  REENTRANCY_CFLAGS="$REENTRANCY_CFLAGS -D_POSIX_PTHREAD_SEMANTICS";;
-esac
-
-REENTRANCY_CFLAGS="$REENTRANCY_CFLAGS -D_REENTRANT"
-
-CFLAGS="$CFLAGS $REENTRANCY_CFLAGS"
+REENTRANCY_FLAGS
 
 AC_FUNC_SELECT_ARGTYPES
 
@@ -166,7 +159,4 @@ dnl ## Build modules.c
 rm -f $srcdir/modules.c
 echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
 
-APACHE_PASSTHRU(REENTRANCY_CFLAGS)
-APACHE_PASSTHRU(REENTRANCY_LDFLAGS)
-
 AC_OUTPUT($APACHE_OUTPUT_FILES)

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index e21c22c90e7b837cd2bab93ada45ffa26c7e4c82..e28ab8b38734ff8752b119bdf03f68483416ddca 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -11,7 +11,7 @@ AC_MSG_RESULT($APACHE_MPM)
 apache_cv_mpm=$APACHE_MPM
        
 if test "$apache_cv_mpm" != "prefork"; then
-  APACHE_CHECK_THREADS
+  PTHREADS_CHECK
   AC_MSG_CHECKING([for which threading library to use])
   AC_MSG_RESULT($threads_result)