cvs commit: apache-2.0/src/modules/mpm config.m4
rbb 99/12/24 10:31:11 Modified:src acinclude.m4 configure.in src/modules/mpm config.m4 Log: Finish the MPM decision logic. This moves the threads checking stuff into the mpm directory where it belongs. It also adds logic so that if threads aren't detected, we automatically choose to use the prefork mpm. Lastly, I also cleaned up a variable name to make it more consistent with the other variables used in our configure script. Revision ChangesPath 1.9 +5 -5 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- acinclude.m4 1999/12/23 21:01:27 1.8 +++ acinclude.m4 1999/12/24 18:31:08 1.9 @@ -113,10 +113,10 @@ int data = 1; return pthread_create(thd, NULL, thread_routine, data); } ], [ - THREADS_WORKING=yes + apache_threads_working=yes ], [ - THREADS_WORKING=no - ], THREADS_WORKING=no ) ] ) + apache_threads_working=no + ], apache_threads_working=no ) ] ) define(APACHE_CHECK_THREADS, [dnl cflags_orig=$CFLAGS @@ -126,11 +126,11 @@ CFLAGS=$test_cflag $cflags_orig LDFLAGS=$test_ldflag $ldflags_orig THREAD_TEST() - if test $THREADS_WORKING = yes; then + if test $apache_threads_working = yes; then break fi done -if test $THREADS_WORKING = yes; then +if test $apache_threads_working = yes; then threads_result=Updating CFLAGS and LDFLAGS break fi 1.16 +0 -4 apache-2.0/src/configure.in Index: configure.in === RCS file: /home/cvs/apache-2.0/src/configure.in,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- configure.in 1999/12/23 21:01:28 1.15 +++ configure.in 1999/12/24 18:31:09 1.16 @@ -73,10 +73,6 @@ dnl ## Check for library functions -AC_MSG_CHECKING([for which threading library to use]) -APACHE_CHECK_THREADS('' -pthread -D_REENTRANT, '' -lpthread -lc_r) -AC_MSG_RESULT($threads_result) - dnl See Comment #Spoon AC_CHECK_FUNCS( \ 1.6 +12 -0 apache-2.0/src/modules/mpm/config.m4 Index: config.m4 === RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- config.m4 1999/12/23 21:01:31 1.5 +++ config.m4 1999/12/24 18:31:10 1.6 @@ -14,6 +14,18 @@ AC_MSG_RESULT(No MPM specified. Using pthread) ]) +AC_MSG_CHECKING([for which threading library to use]) +APACHE_CHECK_THREADS('' -pthread -D_REENTRANT, '' -lpthread -lc_r) +AC_MSG_RESULT($threads_result) + +AC_MSG_CHECKING([to ensure I can compile the selected MPM]) +if test $apache_threads_working = no $apache_cv_mpm != prefork; then +AC_MSG_RESULT([can't compile selected MPM because there are no threads, defaulting to prefork]) +apache_cv_mpm=prefork +else +AC_MSG_RESULT([OK]) +fi + APACHE_OUTPUT(modules/mpm/Makefile) MPM_NAME=$apache_cv_mpm MPM_DIR=modules/mpm/$MPM_NAME
cvs commit: apache-2.0/src/regex .cvsignore
rasmus 99/12/24 10:35:22 Modified:src .cvsignore src/ap .cvsignore src/include .cvsignore src/lib .cvsignore src/lib/apr/include .cvsignore src/main .cvsignore src/modules .cvsignore src/modules/mpm/dexter .cvsignore src/modules/mpm/mpmt_pthread .cvsignore src/modules/mpm/prefork .cvsignore src/modules/standard .cvsignore src/os/unix .cvsignore src/regex .cvsignore Log: Submitted by: Sascha Schumann [EMAIL PROTECTED] Reviewed by: Rasmus Lerdorf Revision ChangesPath 1.3 +10 -0 apache-2.0/src/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/08/27 10:25:27 1.2 +++ .cvsignore1999/12/24 18:35:03 1.3 @@ -14,6 +14,16 @@ CoreR httpd apache +buildconf.stamp +aclocal.m4 +Makefile.in +configure +config.log +.libs +.deps +libtool +config.cache +config.status libhttpd.* Makefile Makefile.config 1.2 +5 -0 apache-2.0/src/ap/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/ap/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 05:50:29 1.1 +++ .cvsignore1999/12/24 18:35:05 1.2 @@ -1,2 +1,7 @@ +Makefile.in +.deps +*.lo +.libs +*.la Makefile Debug 1.2 +2 -1 apache-2.0/src/include/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/include/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 05:50:42 1.1 +++ .cvsignore1999/12/24 18:35:06 1.2 @@ -1 +1,2 @@ -ap_config_auto.h +stamp-h* +ap_config_auto.h* 1.3 +1 -0 apache-2.0/src/lib/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/lib/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/09/27 07:29:08 1.2 +++ .cvsignore1999/12/24 18:35:07 1.3 @@ -1,2 +1,3 @@ +Makefile.in Makefile pth 1.3 +1 -0 apache-2.0/src/lib/apr/include/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/lib/apr/include/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1999/10/10 12:19:58 1.2 +++ .cvsignore1999/12/24 18:35:09 1.3 @@ -1,2 +1,3 @@ +apr.h apr_config.h apr_config.h.in 1.2 +5 -0 apache-2.0/src/main/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/main/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 06:45:15 1.1 +++ .cvsignore1999/12/24 18:35:10 1.2 @@ -1,4 +1,9 @@ Makefile +Makefile.in +.deps +.libs +*.lo +*.la uri_delims.h gen_uri_delims test_char.h 1.2 +1 -0 apache-2.0/src/modules/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/modules/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/08/24 06:55:05 1.1 +++ .cvsignore1999/12/24 18:35:11 1.2 @@ -1 +1,2 @@ +Makefile.in Makefile 1.2 +3 -0 apache-2.0/src/modules/mpm/dexter/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/modules/mpm/dexter/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/07/21 19:08:33 1.1 +++ .cvsignore1999/12/24 18:35:12 1.2 @@ -1 +1,4 @@ +Makefile.in +*.lo +*.la Makefile 1.2 +5 -0 apache-2.0/src/modules/mpm/mpmt_pthread/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_pthread/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore1999/06/24 12:24:31 1.1 +++ .cvsignore1999/12/24 18:35:14 1.2
cvs commit: apache-2.0/src acinclude.m4
rasmus 99/12/24 11:04:40 Modified:src acinclude.m4 Log: Submitted by: Sascha Schumann [EMAIL PROTECTED] Reviewed by: Rasmus Lerdorf Revision ChangesPath 1.11 +1 -1 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- acinclude.m4 1999/12/24 18:40:26 1.10 +++ acinclude.m4 1999/12/24 19:04:40 1.11 @@ -87,7 +87,7 @@ dnl execute code, if variable is not set in namespace dnl AC_DEFUN(APACHE_ONCE,[ - unique=`echo $ac_n $2$ac_c | tr -c -d a-zA-Z0-9` + unique=`echo $ac_n $2$ac_c | tr -cd a-zA-Z0-9` cmd=echo $ac_n \\$$1$unique$ac_c\ if test -n $unique test `eval $cmd` = ; then eval $1$unique=set
cvs commit: apache-2.0/src/modules/mpm config.m4
rbb 99/12/24 13:12:24 Modified:src/modules/mpm config.m4 Log: Fix the threads check so it works on non-bash shells. Submitted by: Sascha Schumann Reviewed by:Ryan Bloom Revision ChangesPath 1.7 +1 -1 apache-2.0/src/modules/mpm/config.m4 Index: config.m4 === RCS file: /home/cvs/apache-2.0/src/modules/mpm/config.m4,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- config.m4 1999/12/24 18:31:10 1.6 +++ config.m4 1999/12/24 21:12:20 1.7 @@ -19,7 +19,7 @@ AC_MSG_RESULT($threads_result) AC_MSG_CHECKING([to ensure I can compile the selected MPM]) -if test $apache_threads_working = no $apache_cv_mpm != prefork; then +if test $apache_threads_working = no test $apache_cv_mpm != prefork; then AC_MSG_RESULT([can't compile selected MPM because there are no threads, defaulting to prefork]) apache_cv_mpm=prefork else
cvs commit: apache-2.0/src acinclude.m4
rbb 99/12/24 13:22:28 Modified:src acinclude.m4 Log: Cleanup the threads check, also resets the CFLAGS and LDFLAGS variables in cases where no threading library was found. Submitted by: Sascha Schumann Reviewed by: Ryan Bloom Revision ChangesPath 1.12 +8 -6 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- acinclude.m4 1999/12/24 19:04:40 1.11 +++ acinclude.m4 1999/12/24 21:22:27 1.12 @@ -127,15 +127,17 @@ LDFLAGS=$test_ldflag $ldflags_orig THREAD_TEST() if test $apache_threads_working = yes; then -break +break 2 fi done -if test $apache_threads_working = yes; then - threads_result=Updating CFLAGS and LDFLAGS - break -fi - threads_result=Threads not found done + if test $apache_threads_working = yes; then +threads_result=POSIX Threads found + else +CFLAGS=$cflags_orig +LDFLAGS=$ldflags_orig +threads_result=POSIX Threads not found + fi ] ) dnl