You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by sa...@hyperreal.org on 2000/01/16 19:24:40 UTC
cvs commit: apache-2.0/src acinclude.m4 configure.in
sascha 00/01/16 10:24:40
Modified: src acinclude.m4 configure.in
Log:
Rewrite pthreads check to be more tool-independent, and propagate flags
to APR.
Revision Changes Path
1.16 +25 -38 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- acinclude.m4 2000/01/12 20:41:57 1.15
+++ acinclude.m4 2000/01/16 18:24:39 1.16
@@ -141,28 +141,6 @@
fi
])
-dnl APACHE_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
-AC_DEFUN(APACHE_CHECK_GCC_ARG,[
- gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
- AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
- echo 'void somefunc() { };' > conftest.c
- cmd='$CC $1 -c conftest.c'
- if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then
- ac_result=no
- else
- ac_result=yes
- fi
- eval $gcc_arg_name=$ac_result
- rm -f conftest.*
- ])
- if eval test "\$$gcc_arg_name" = "yes"; then
- $2
- else
- :
- $3
- fi
-])
-
dnl
dnl APACHE_CHECK_THREADS()
dnl
@@ -189,26 +167,35 @@
AC_DEFUN(APACHE_CHECK_THREADS,[
-old_CFLAGS="$CFLAGS"
+APACHE_THREAD_TEST
-if test -n "$GCC"; then
- APACHE_CHECK_GCC_ARG(-pthread, [
- CFLAGS="$CFLAGS -pthread"
- ],[
- APACHE_CHECK_GCC_ARG(-pthreads, [
- CFLAGS="$CFLAGS -pthreads"
- ],[
- APACHE_CHECK_GCC_ARG(-mthreads, [
- CFLAGS="$CFLAGS -mthreads"
- ])])])
+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
-APACHE_THREAD_TEST
-
if test "$apache_threads_working" != "yes"; then
- CFLAGS="$old_CFLAGS"
- AC_CHECK_LIB(pthread, pthread_kill)
- APACHE_THREAD_TEST
+ 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
1.19 +6 -4 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- configure.in 2000/01/11 13:10:56 1.18
+++ configure.in 2000/01/16 18:24:39 1.19
@@ -104,11 +104,13 @@
case "`uname -sr`" in
"SunOS 5"*)
- REENTRANCY_FLAGS="$REENTRANCY_FLAGS -D_POSIX_PTHREAD_SEMANTICS";;
+ REENTRANCY_CFLAGS="$REENTRANCY_CFLAGS -D_POSIX_PTHREAD_SEMANTICS";;
esac
-REENTRANCY_FLAGS="$REENTRANCY_FLAGS -D_REENTRANT"
+REENTRANCY_CFLAGS="$REENTRANCY_CFLAGS -D_REENTRANT"
+CFLAGS="$CFLAGS $REENTRANCY_CFLAGS"
+
AC_FUNC_SELECT_ARGTYPES
dnl Check if we'll actually need to cast select args all the time
@@ -156,7 +158,6 @@
$SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
fi
-CPPFLAGS="$CPPFLAGS $REENTRANCY_FLAGS"
APACHE_FAST_OUTPUT(Makefile ap/Makefile lib/Makefile main/Makefile
modules/Makefile os/Makefile)
APACHE_FAST_GENERATE
@@ -165,6 +166,7 @@
rm -f $srcdir/modules.c
echo $MODLIST | $AWK -f $srcdir/helpers/build-modules-c.awk > $srcdir/modules.c
-APACHE_PASSTHRU(REENTRANCY_FLAGS)
+APACHE_PASSTHRU(REENTRANCY_CFLAGS)
+APACHE_PASSTHRU(REENTRANCY_LDFLAGS)
AC_OUTPUT($APACHE_OUTPUT_FILES)