VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-20 16:09:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Sascha Schumann
2000-01-16 20:00:51 +00:00
parent e959e6b340
commit ab6abdbd53
4 changed files with 5 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
acinclude.m4
View File

@ -141,69 +141,7 @@ AC_DEFUN(APACHE_ONCE,[
fi fi
]) ])
dnl sinclude(lib/apr/threads.m4)
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
])
dnl dnl
dnl APACHE_INADDR_NONE dnl APACHE_INADDR_NONE

4
build/build2.mk
View File

@ -21,7 +21,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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 include generated_lists
@ -73,6 +73,6 @@ $(apr_config_h_in): $(apr_configure) lib/apr/acconfig.h
@rm -f $@ @rm -f $@
(cd lib/apr && autoheader) (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 $@ @echo rebuilding $@
(cd lib/apr && autoconf) (cd lib/apr && autoconf)

12
configure.in
View File

@ -102,14 +102,7 @@ AC_CHECK_FUNCS(inet_addr inet_network, break, [
APACHE_INADDR_NONE APACHE_INADDR_NONE
case "`uname -sr`" in REENTRANCY_FLAGS
"SunOS 5"*)
REENTRANCY_CFLAGS="$REENTRANCY_CFLAGS -D_POSIX_PTHREAD_SEMANTICS";;
esac
REENTRANCY_CFLAGS="$REENTRANCY_CFLAGS -D_REENTRANT"
CFLAGS="$CFLAGS $REENTRANCY_CFLAGS"
AC_FUNC_SELECT_ARGTYPES AC_FUNC_SELECT_ARGTYPES
@ -166,7 +159,4 @@ dnl ## Build modules.c
rm -f $srcdir/modules.c rm -f $srcdir/modules.c
echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $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) AC_OUTPUT($APACHE_OUTPUT_FILES)

2
server/mpm/config.m4
View File

@ -11,7 +11,7 @@ AC_MSG_RESULT($APACHE_MPM)
apache_cv_mpm=$APACHE_MPM apache_cv_mpm=$APACHE_MPM
if test "$apache_cv_mpm" != "prefork"; then if test "$apache_cv_mpm" != "prefork"; then
APACHE_CHECK_THREADS PTHREADS_CHECK
AC_MSG_CHECKING([for which threading library to use]) AC_MSG_CHECKING([for which threading library to use])
AC_MSG_RESULT($threads_result) AC_MSG_RESULT($threads_result)