cvs commit: apache-2.0/src/build build.mk build2.mk
sascha 00/01/16 09:18:14 Modified:src/build build.mk build2.mk Log: Remove dependency on automake's aclocal. We continue to use acinclude.m4, because aclocal.m4 needs to contain libtool's m4 macros. Revision ChangesPath 1.3 +2 -1 apache-2.0/src/build/build.mk Index: build.mk === RCS file: /home/cvs/apache-2.0/src/build/build.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- build.mk 2000/01/12 16:55:58 1.2 +++ build.mk 2000/01/16 17:18:13 1.3 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build.mk,v 1.2 2000/01/12 16:55:58 sascha Exp $ +# $Id: build.mk,v 1.3 2000/01/16 17:18:13 sascha Exp $ # # Makefile to generate build tools # @@ -33,6 +33,7 @@ generated_lists: @echo config_m4_files = `find . -name config.m4` $@ + @n=`which libtool`; echo libtool_prefix = `dirname $$n`/.. $@ $(STAMP): build/buildcheck.sh @build/buildcheck.sh touch $(STAMP) 1.2 +7 -5 apache-2.0/src/build/build2.mk Index: build2.mk === RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- build2.mk 2000/01/11 13:10:58 1.1 +++ build2.mk 2000/01/16 17:18:13 1.2 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build2.mk,v 1.1 2000/01/11 13:10:58 sascha Exp $ +# $Id: build2.mk,v 1.2 2000/01/16 17:18:13 sascha Exp $ include generated_lists @@ -37,17 +37,19 @@ APR_TARGETS = $(apr_configure) $(apr_config_h_in) -targets = .deps $(APACHE_TARGETS) $(APR_TARGETS) +targets = .deps aclocal.m4 $(APACHE_TARGETS) $(APR_TARGETS) all: $(targets) .deps: touch $@ -aclocal.m4: configure.in acinclude.m4 +libtool_m4 = $(libtool_prefix)/share/aclocal/libtool.m4 + +aclocal.m4: acinclude.m4 $(libtool_m4) @echo rebuilding $@ - aclocal - + @cat acinclude.m4 $(libtool_m4) $@ + $(LT_TARGETS): libtoolize $(AMFLAGS) --force
cvs commit: apache-2.0/src/build build2.mk
sascha 00/01/16 10:20:18 Modified:src/build build2.mk Log: Remove config.cache, if configure is rebuilt Revision ChangesPath 1.3 +2 -1 apache-2.0/src/build/build2.mk Index: build2.mk === RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- build2.mk 2000/01/16 17:18:13 1.2 +++ build2.mk 2000/01/16 18:20:17 1.3 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build2.mk,v 1.2 2000/01/16 17:18:13 sascha Exp $ +# $Id: build2.mk,v 1.3 2000/01/16 18:20:17 sascha Exp $ include generated_lists @@ -65,6 +65,7 @@ configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ + rm -f config.cache autoconf $(apr_config_h_in): $(apr_configure) lib/apr/acconfig.h
cvs commit: apache-2.0/src/lib/apr configure.in
sascha 00/01/16 10:20:57 Modified:src/lib/apr configure.in Log: Inherit thread flags from Apache Revision ChangesPath 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)
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 ChangesPath
1.16 +25 -38apache-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 21 | 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)
cvs commit: apache-2.0/src/modules/mpm config.m4
sascha 00/01/16 12:00:52
Modified:src acinclude.m4 configure.in
src/build build2.mk
src/lib/apr aclocal.m4 configure.in
src/modules/mpm config.m4
Added: src/lib/apr threads.m4
Log:
Move threads/reentrancy m4 macros into threads.m4. All results are now
cached and can be made easily available to Apache and APR.
Revision ChangesPath
1.17 +1 -63 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- acinclude.m4 2000/01/16 18:24:39 1.16
+++ acinclude.m4 2000/01/16 20:00:46 1.17
@@ -141,69 +141,7 @@
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
1.20 +1 -11 apache-2.0/src/configure.in
Index: configure.in
===
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -u -r1.19 -r1.20
--- configure.in 2000/01/16 18:24:39 1.19
+++ configure.in 2000/01/16 20:00:46 1.20
@@ -102,15 +102,8 @@
APACHE_INADDR_NONE
-case `uname -sr` in
-SunOS 5*)
- REENTRANCY_CFLAGS=$REENTRANCY_CFLAGS -D_POSIX_PTHREAD_SEMANTICS;;
-esac
+REENTRANCY_FLAGS
-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
@@ -165,8 +158,5 @@
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)
1.4 +2 -2 apache-2.0/src/build/build2.mk
Index: build2.mk
===
RCS file: /home/cvs/apache-2.0/src/build/build2.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- build2.mk 2000/01/16 18:20:17 1.3
+++ build2.mk 2000/01/16 20:00:48 1.4
@@ -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 @@
@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)
1.10 +2 -0 apache-2.0/src/lib/apr/aclocal.m4
Index: aclocal.m4
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- aclocal.m42000/01/11 12:58:46 1.9
+++ aclocal.m42000/01/16 20:00:49 1.10
@@ -187,3 +187,5 @@
AC_DEFINE(HAVE_SOCKLEN_T, 1, [Whether you have socklen_t])
fi
])
+
+sinclude(threads.m4
cvs commit: apache-1.3/src/os/unix os.c
sascha 00/01/15 08:01:09 Modified:src Configure src/os/unix os.c Log: Disable dl emulation code for AIX 4.3, if no dl functions are needed. Revision ChangesPath 1.388 +8 -0 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.387 retrieving revision 1.388 diff -u -u -r1.387 -r1.388 --- Configure 2000/01/14 16:10:34 1.387 +++ Configure 2000/01/15 16:01:07 1.388 @@ -1795,6 +1795,14 @@ fi +## Don't force DL emulation, if not necessary. Currently only used +## by os/unix/os.c. +## +if [ x$using_shlib != x1 ] ; then +CFLAGS=$CFLAGS -DNO_DL_NEEDED +fi + + ## Set the value of the shared libary flags, if they aren't explicitly ## set in the configuration file ## 1.20 +1 -1 apache-1.3/src/os/unix/os.c Index: os.c === RCS file: /home/cvs/apache-1.3/src/os/unix/os.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -u -r1.19 -r1.20 --- os.c 1999/12/09 19:21:56 1.19 +++ os.c 2000/01/15 16:01:09 1.20 @@ -17,7 +17,7 @@ * Insert the DSO emulation code for AIX for releases of AIX prior * to 4.3. Use the native DSO code for 4.3 and later. */ -#ifdef AIX +#if defined(AIX) !defined(NO_DL_NEEDED) #if AIX 43 #include os-aix-dso.c #endif
cvs commit: apache-2.0/src/build build.mk
sascha 00/01/12 08:56:00 Modified:src/build build.mk Log: `-follow' is a GNU extension, remove it. Revision ChangesPath 1.2 +2 -2 apache-2.0/src/build/build.mk Index: build.mk === RCS file: /home/cvs/apache-2.0/src/build/build.mk,v retrieving revision 1.1 retrieving revision 1.2 diff -u -u -r1.1 -r1.2 --- build.mk 2000/01/11 13:10:58 1.1 +++ build.mk 2000/01/12 16:55:58 1.2 @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # ## -# $Id: build.mk,v 1.1 2000/01/11 13:10:58 sascha Exp $ +# $Id: build.mk,v 1.2 2000/01/12 16:55:58 sascha Exp $ # # Makefile to generate build tools # @@ -55,7 +55,7 @@ bzip2 -t $$distname.tar.bz2 cvsclean: - @for i in `find . -follow -name .cvsignore`; do \ + @for i in `find . -name .cvsignore`; do \ (cd `dirname $$i` 2/dev/null rm -rf `cat .cvsignore` *.o *.a || true); \ done @rm -f $(SUBDIRS) 2/dev/null || true
cvs commit: apache-2.0/src acinclude.m4
sascha 00/01/12 12:41:59 Modified:src acinclude.m4 Log: gcc on AIX takes -mthreads. I wonder what they smoked during creating all those wonderful flags. Revision ChangesPath 1.15 +4 -1 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.14 retrieving revision 1.15 diff -u -u -r1.14 -r1.15 --- acinclude.m4 2000/01/11 13:10:56 1.14 +++ acinclude.m4 2000/01/12 20:41:57 1.15 @@ -197,7 +197,10 @@ ],[ APACHE_CHECK_GCC_ARG(-pthreads, [ CFLAGS=$CFLAGS -pthreads -])]) +],[ +APACHE_CHECK_GCC_ARG(-mthreads, [ +CFLAGS=$CFLAGS -mthreads +])])]) fi APACHE_THREAD_TEST
cvs commit: apache-2.0/src/lib/apr acconfig.h aclocal.m4
sascha 00/01/11 04:58:47 Modified:src/lib/apr acconfig.h aclocal.m4 Log: Typedef socklen_t instead of defining it. Revision ChangesPath 1.20 +4 -0 apache-2.0/src/lib/apr/acconfig.h Index: acconfig.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -u -r1.19 -r1.20 --- acconfig.h1999/12/31 04:15:08 1.19 +++ acconfig.h2000/01/11 12:58:46 1.20 @@ -78,4 +78,8 @@ #define strcasecmp(s1,s2) stricmp(s1,s2) #endif +#if !defined(HAVE_SOCKLEN_T) +typedef int socklen_t; +#endif + #endif /* APR_CONFIG_H */ 1.9 +2 -2 apache-2.0/src/lib/apr/aclocal.m4 Index: aclocal.m4 === RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v retrieving revision 1.8 retrieving revision 1.9 diff -u -u -r1.8 -r1.9 --- aclocal.m41999/12/29 23:54:27 1.8 +++ aclocal.m42000/01/11 12:58:46 1.9 @@ -183,7 +183,7 @@ ]) ]) -if test $ac_cv_socklen_t = no; then - AC_DEFINE(socklen_t, unsigned int, [Whether you have socklen_t]) +if test $ac_cv_socklen_t = yes; then + AC_DEFINE(HAVE_SOCKLEN_T, 1, [Whether you have socklen_t]) fi ])
cvs commit: apache-2.0/src/lib/apr configure.in
sascha 00/01/11 04:59:35 Modified:src/lib/apr configure.in Log: Use REENTRANCY_FLAGS from config.cache (effectively only set by Apache) Revision ChangesPath 1.42 +4 -0 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.41 retrieving revision 1.42 diff -u -u -r1.41 -r1.42 --- configure.in 1999/12/29 23:54:27 1.41 +++ configure.in 2000/01/11 12:59:34 1.42 @@ -80,6 +80,10 @@ 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
cvs commit: apache-2.0/src/lib/apr Makefile.in
sascha 00/01/11 05:00:29 Modified:src/lib/apr Makefile.in Log: Add install and $(LIBAPR) target Revision ChangesPath 1.17 +10 -4 apache-2.0/src/lib/apr/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/Makefile.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -u -r1.16 -r1.17 --- Makefile.in 2000/01/09 03:52:35 1.16 +++ Makefile.in 2000/01/11 13:00:28 1.17 @@ -28,6 +28,8 @@ [EMAIL PROTECTED]@ #shmem/@OSDIR@ +LIBAPR = @[EMAIL PROTECTED] + # # Rules for turning inputs into outputs # @@ -38,13 +40,15 @@ # Rules for building specific targets, starting with 'all' for # building the entire package. # -all: Makefile $(MODULES) subdirs +all: Makefile $(MODULES) subdirs $(LIBAPR) + +$(LIBAPR): @rm -rf objs @mkdir objs - @rm -f @[EMAIL PROTECTED] + @rm -f $@ for i in $(SUBDIRS); do cp $$i/*.o objs ; done; - $(AR) cr @[EMAIL PROTECTED] objs/*.o - $(RANLIB) @[EMAIL PROTECTED] + $(AR) cr $@ objs/*.o + $(RANLIB) $@ clean: subdirs_clean $(RM) -f *.o *.a *.so objs/*.o @@ -90,4 +94,6 @@ echo === $(SDP)lib/apr/$$i; \ done; +install: all + # DO NOT REMOVE
cvs commit: apache-2.0/src/regex .cvsignore
sascha 00/01/11 05:04:02 Modified:src/ap .cvsignore src .cvsignore src/lib .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 Added: src/modules/mpm .cvsignore src/os .cvsignore Log: Update .cvsignore files Revision ChangesPath 1.3 +0 -1 apache-2.0/src/ap/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/ap/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- .cvsignore1999/12/24 18:35:05 1.2 +++ .cvsignore2000/01/11 13:03:54 1.3 @@ -1,4 +1,3 @@ -Makefile.in .deps *.lo .libs 1.4 +12 -2 apache-2.0/src/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- .cvsignore1999/12/24 18:35:03 1.3 +++ .cvsignore2000/01/11 13:03:54 1.4 @@ -14,16 +14,26 @@ CoreR httpd apache -buildconf.stamp +buildmk.stamp aclocal.m4 -Makefile.in configure config.log +*.lo .libs .deps libtool +generated_lists +config_vars.mk +config.guess +config.sub config.cache config.status +shlibtool +ltconfig +ltmain.sh +install-sh +missing +mkinstalldirs libhttpd.* Makefile Makefile.config 1.4 +0 -1 apache-2.0/src/lib/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/lib/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- .cvsignore1999/12/24 18:35:07 1.3 +++ .cvsignore2000/01/11 13:03:55 1.4 @@ -1,3 +1,2 @@ -Makefile.in Makefile pth 1.3 +0 -1 apache-2.0/src/main/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/main/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- .cvsignore1999/12/24 18:35:10 1.2 +++ .cvsignore2000/01/11 13:03:57 1.3 @@ -1,5 +1,4 @@ Makefile -Makefile.in .deps .libs *.lo 1.3 +0 -1 apache-2.0/src/modules/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/modules/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- .cvsignore1999/12/24 18:35:11 1.2 +++ .cvsignore2000/01/11 13:03:58 1.3 @@ -1,2 +1 @@ -Makefile.in Makefile 1.3 +0 -1 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.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- .cvsignore1999/12/24 18:35:12 1.2 +++ .cvsignore2000/01/11 13:03:58 1.3 @@ -1,4 +1,3 @@ -Makefile.in *.lo *.la Makefile 1.1 apache-2.0/src/modules/mpm/.cvsignore Index: .cvsignore === Makefile 1.3 +0 -1 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.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- .cvsignore1999/12/24 18:35:14 1.2 +++ .cvsignore2000/01/11 13:03:59 1.3 @@ -1,4 +1,3 @@ -Makefile.in .deps .libs *.lo 1.3 +0 -1 apache-2.0/src/modules/mpm/prefork/.cvsignore Index: .cvsignore === RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -u -r1.2 -r1.3 --- .cvsignore1999/12/24 18:35:15 1.2 +++ .cvsignore2000/01/11 13:04:00 1.3 @@ -1,4 +1,3 @@ -Makefile.in *.lo *.la Makefile 1.3 +2 -1 apache-2.0/src/modules/standard/.cvsignore Index: .cvsignore === RCS
cvs commit: apache-2.0/src/build - New directory
sascha 00/01/11 05:07:55 apache-2.0/src/build - New directory
cvs commit: apache-2.0/src/regex Makefile.in config.m4 Makefile.am
sascha 00/01/11 05:11:14
Modified:src acinclude.m4 buildconf configure.in
src/modules/mpm config.m4
src/modules/mpm/dexter config.m4
src/modules/mpm/mpmt_pthread config.m4
src/modules/mpm/prefork config.m4 prefork.c
src/modules/standard config.m4
src/os config.m4
src/regex config.m4
Added: src Makefile.in
src/ap Makefile.in
src/build build.mk build2.mk buildcheck.sh fastgen.sh
library.mk ltlib.mk mkdep.perl program.mk rules.mk
special.mk
src/helpers cvsclean snapshot
src/lib Makefile.in
src/lib/expat-lite Makefile.in
src/main Makefile.in
src/modules Makefile.in
src/modules/mpm Makefile.in
src/modules/mpm/dexter Makefile.in
src/modules/mpm/mpmt_pthread Makefile.in
src/modules/mpm/prefork Makefile.in
src/modules/standard Makefile.in
src/os Makefile.in
src/os/unix Makefile.in
src/regex Makefile.in
Removed: src Makefile.am
src/ap Makefile.am
src/lib Makefile.am
src/main Makefile.am
src/modules Makefile.am
src/modules/mpm Makefile.am
src/modules/mpm/dexter Makefile.am
src/modules/mpm/mpmt_pthread Makefile.am
src/modules/mpm/prefork Makefile.am
src/modules/standard Makefile.am
src/os Makefile.am
src/os/unix Makefile.am
src/regex Makefile.am
Log:
These changes are committed together, because they depend on each other.
- shared modules can be built in the tree
- added support for --with-layout, uses APACI's config.layout
- working 'make install'
- working 'make depend'
- working Pthreads checks
- buildconf replaced
Revision ChangesPath
1.14 +298 -49 apache-2.0/src/acinclude.m4
Index: acinclude.m4
===
RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- acinclude.m4 1999/12/29 23:41:56 1.13
+++ acinclude.m4 2000/01/11 13:10:56 1.14
@@ -1,31 +1,77 @@
-dnl
-dnl APACHE_MODULE(modname [, shared])
-dnl
-dnl Includes an extension in the build.
-dnl
-dnl modname is the name of the modules/ subdir where the extension resides
-dnl shared can be set to shared or yes to build the extension as
-dnl a dynamically loadable library.
-dnl
-dnl XXX - for now, all modules using this function are in modules/standard
-AC_DEFUN(APACHE_MODULE,[
- if test -d $cwd/$srcdir/modules/standard ; then
-dnlMOD_SUBDIRS=$MOD_SUBDIRS $1
-if test $2 != shared -a $2 != yes; then
- libname=`basename $1`
- _extlib=libapachemod_${libname}.a
- MOD_LTLIBS=$MOD_LTLIBS modules/standard/libapachemod_${libname}.la
- MOD_LIBS=$MOD_LIBS standard/$_extlib
- MOD_STATIC=$MOD_STATIC $1
+
+AC_DEFUN(APACHE_PASSTHRU,[
+ unset ac_cv_pass_$1
+ AC_CACHE_VAL(ac_cv_pass_$1, [ac_cv_pass_$1=$$1])
+])
+
+dnl APACHE_SUBST(VARIABLE)
+dnl Makes VARIABLE available in generated files
+dnl (do not use @variable@ in Makefiles, but $(variable))
+AC_DEFUN(APACHE_SUBST,[
+ APACHE_VAR_SUBST=$APACHE_VAR_SUBST $1
+ AC_SUBST($1)
+])
+
+dnl APACHE_FAST_OUTPUT(FILENAME)
+dnl Perform substitutions on FILENAME (Makefiles only)
+AC_DEFUN(APACHE_FAST_OUTPUT,[
+ APACHE_FAST_OUTPUT_FILES=$APACHE_FAST_OUTPUT_FILES $1
+])
+
+dnl APACHE_MKDIR_P_CHECK
+dnl checks whether mkdir -p works
+AC_DEFUN(APACHE_MKDIR_P_CHECK,[
+ AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
+test -d conftestdir rm -rf conftestdir
+mkdir -p conftestdir/somedir /dev/null 21
+if test -d conftestdir/somedir; then
+ ac_cv_mkdir_p=yes
else
- MOD_SHARED=$MOD_SHARED $1
+ ac_cv_mkdir_p=no
fi
-dnlAPACHE_OUTPUT(modules/$1/Makefile)
- fi
+rm -rf conftestdir
+ ])
+])
+
+dnl APACHE_FAST_GENERATE
+dnl Creates Makefiles and config_vars.mk
+AC_DEFUN(APACHE_FAST_GENERATE,[
+ APACHE_SUBST(abs_srcdir)
+ APACHE_SUBST(bindir)
+ APACHE_SUBST(cgidir)
+ APACHE_SUBST(logdir)
+ APACHE_SUBST(exec_prefix)
+ APACHE_SUBST(libexecdir)
+ APACHE_SUBST(htdocsdir)
+ APACHE_SUBST(includedir)
+ APACHE_SUBST(iconsdir)
+ APACHE_SUBST(sysconfdir)
+ APACHE_SUBST(prefix)
+ APACHE_SUBST(CC)
+ APACHE_SUBST(CFLAGS)
+ APACHE_SUBST(CPPFLAGS)
+ APACHE_SUBST(LDFLAGS)
+ APACHE_SUBST(DEFS)
+ APACHE_SUBST(LIBTOOL)
+ APACHE_SUBST(SHELL)
+ APACHE_SUBST(MODULE_DIRS
cvs commit: apache-2.0/src/os config.m4
sascha 00/01/11 09:28:29
Modified:src/os config.m4
Log:
Make OS selection work for non-UNIX cases
Revision ChangesPath
1.3 +12 -5 apache-2.0/src/os/config.m4
Index: config.m4
===
RCS file: /home/cvs/apache-2.0/src/os/config.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- config.m4 2000/01/11 13:11:12 1.2
+++ config.m4 2000/01/11 17:28:28 1.3
@@ -1,8 +1,15 @@
-AC_MSG_CHECKING(which OS this is)
+AC_MSG_CHECKING(for target platform)
-dnl ## XXX - I'm not sure, but this might not handle the non-Unix case yet
-OS=unix
+PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
+
+case $PLATFORM in
+*beos*)
+ OS=beos;;
+*)
+ OS=unix;;
+esac
+
OS_DIR=os/$OS
-AC_MSG_RESULT([$OS])
-APACHE_FAST_OUTPUT(os/$OS/Makefile)
+AC_MSG_RESULT($OS)
+APACHE_FAST_OUTPUT($OS_DIR/Makefile)
cvs commit: apache-2.0/src/lib/apr/mmap/unix common.c
sascha 00/01/03 05:41:06 Modified:src/lib/apr/mmap/unix common.c Log: Pointer arithmetic using void * is non-sense. GCC implicitly converts these constructs to char *. To support other compilers, we cast explicitly. Revision ChangesPath 1.7 +1 -1 apache-2.0/src/lib/apr/mmap/unix/common.c Index: common.c === RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/common.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -u -r1.6 -r1.7 --- common.c 1999/12/03 15:18:31 1.6 +++ common.c 2000/01/03 13:41:06 1.7 @@ -75,7 +75,7 @@ if (offset 0 || offset mmap-size) return APR_EINVAL; -(*addr) = mmap-mm + offset; +(*addr) = (char *) mmap-mm + offset; return APR_SUCCESS; }
cvs commit: apache-2.0/src/lib/apr/network_io/unix sockets.c
sascha 99/12/31 17:53:08
Modified:src/lib/apr/network_io/unix sockets.c
Log:
Fix typo, the parameter name is `sock' not `socket'
Revision ChangesPath
1.27 +1 -1 apache-2.0/src/lib/apr/network_io/unix/sockets.c
Index: sockets.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -u -r1.26 -r1.27
--- sockets.c 1999/12/03 15:18:34 1.26
+++ sockets.c 2000/01/01 01:53:07 1.27
@@ -261,7 +261,7 @@
*/
ap_status_t ap_get_socketdata(void **data, char *key, struct socket_t *sock)
{
-if (socket != NULL) {
+if (sock != NULL) {
return ap_get_userdata(data, key, sock-cntxt);
}
else {
cvs commit: apache-2.0/src/lib/apr/locks/unix Makefile.in
sascha 99/12/30 19:47:32 Modified:src/lib/apr/locks/unix Makefile.in Log: Remove trailing slash, confuses some makes Revision ChangesPath 1.7 +1 -1 apache-2.0/src/lib/apr/locks/unix/Makefile.in Index: Makefile.in === RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -u -r1.6 -r1.7 --- Makefile.in 1999/12/20 20:02:38 1.6 +++ Makefile.in 1999/12/31 03:47:32 1.7 @@ -17,7 +17,7 @@ OBJS=locks.o \ crossproc.o \ - intraproc.o \ + intraproc.o .c.o: $(CC) $(CFLAGS) -c $(INCLUDES) $
cvs commit: apache-2.0/src/lib/apr/threadproc/unix proc.c
sascha 99/12/30 20:15:14
Modified:src/lib/apr acconfig.h
src/lib/apr/lib apr_signal.c
src/lib/apr/test htdigest.c htpasswd.c
src/lib/apr/threadproc/os2 proc.c
src/lib/apr/threadproc/unix proc.c
Log:
Use always ap_signal() in APR to avoid redefining the system call signal()
Revision ChangesPath
1.19 +3 -2 apache-2.0/src/lib/apr/acconfig.h
Index: acconfig.h
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/acconfig.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- acconfig.h1999/12/22 20:29:16 1.18
+++ acconfig.h1999/12/31 04:15:08 1.19
@@ -61,12 +61,13 @@
#ifdef HAVE_SIGACTION
typedef void Sigfunc(int);
-#define signal(s,f)ap_signal(s, f)
-Sigfunc *signal(int signo, Sigfunc * func);
+Sigfunc *ap_signal(int signo, Sigfunc * func);
#if defined(SIG_ING) !defined(SIG_ERR)
#define SIG_ERR ((Sigfunc *)-1)
#endif
+#else
+#define ap_signal(a,b) signal(a,b)
#endif
#if !defined(HAVE_PTHREAD_SIGMASK) defined(_AIX)
1.4 +1 -1 apache-2.0/src/lib/apr/lib/apr_signal.c
Index: apr_signal.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_signal.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- apr_signal.c 1999/12/01 18:39:35 1.3
+++ apr_signal.c 1999/12/31 04:15:08 1.4
@@ -67,7 +67,7 @@
* from W. Richard Stevens' Advanced Programming in the UNIX Environment
* (the version that does not automatically restart system calls).
*/
-Sigfunc *signal(int signo, Sigfunc * func)
+Sigfunc *ap_signal(int signo, Sigfunc * func)
{
struct sigaction act, oact;
1.12 +1 -1 apache-2.0/src/lib/apr/test/htdigest.c
Index: htdigest.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htdigest.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- htdigest.c1999/12/20 19:44:42 1.11
+++ htdigest.c1999/12/31 04:15:10 1.12
@@ -209,7 +209,7 @@
ap_create_context(cntxt, NULL);
tn = NULL;
-signal(SIGINT, (void (*)(int)) interrupted);
+ap_signal(SIGINT, (void (*)(int)) interrupted);
if (argc == 5) {
if (strcmp(argv[1], -c))
usage();
1.2 +1 -1 apache-2.0/src/lib/apr/test/htpasswd.c
Index: htpasswd.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/test/htpasswd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- htpasswd.c1999/08/17 15:59:48 1.1
+++ htpasswd.c1999/12/31 04:15:11 1.2
@@ -328,7 +328,7 @@
int args_left = 2;
tempfilename = NULL;
-signal(SIGINT, (void (*)(int)) interrupted);
+ap_signal(SIGINT, (void (*)(int)) interrupted);
/*
* Preliminary check to make sure they provided at least
1.12 +1 -1 apache-2.0/src/lib/apr/threadproc/os2/proc.c
Index: proc.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- proc.c1999/12/19 08:33:52 1.11
+++ proc.c1999/12/31 04:15:12 1.12
@@ -247,7 +247,7 @@
DosSetFHState(attr-parent_err-filedes, OPEN_FLAGS_NOINHERIT);
}
-signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
+ap_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
if (attr-currdir != NULL) {
_getcwd2(savedir, sizeof(savedir));
1.14 +1 -1 apache-2.0/src/lib/apr/threadproc/unix/proc.c
Index: proc.c
===
RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- proc.c1999/12/03 15:18:37 1.13
+++ proc.c1999/12/31 04:15:13 1.14
@@ -355,7 +355,7 @@
ap_close(attr-child_err);
}
-signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
+ap_signal(SIGCHLD, SIG_DFL); /*not sure if this is needed or not */
if (attr-currdir != NULL) {
if (chdir(attr-currdir) == -1) {
cvs commit: apache-2.0/src acinclude.m4
sascha 99/12/29 15:41:57 Modified:src acinclude.m4 Log: (APACHE_INADDR_NONE) Additionally include sys/types.h, if it is available. Also added confdefs checks for the other included header files. Revision ChangesPath 1.13 +9 -0 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- acinclude.m4 1999/12/24 21:22:27 1.12 +++ acinclude.m4 1999/12/29 23:41:56 1.13 @@ -147,9 +147,18 @@ dnl AC_DEFUN(APACHE_INADDR_NONE,[ AC_TRY_COMPILE([ +#ifdef HAVE_SYS_TYPES_H +#include sys/types.h +#endif +#ifdef HAVE_SYS_SOCKET_H #include sys/socket.h +#endif +#ifdef HAVE_NETINET_IN_H #include netinet/in.h +#endif +#ifdef HAVE_ARPA_INET_H #include arpa/inet.h +#endif ],[ unsigned long foo = INADDR_NONE; ],[
cvs commit: apache-2.0/src/regex config.m4
sascha 99/12/29 15:52:29 Modified:src/regex config.m4 Log: Define HS regex-specific macro, if memmove is not available. Revision ChangesPath 1.4 +5 -0 apache-2.0/src/regex/config.m4 Index: config.m4 === RCS file: /home/cvs/apache-2.0/src/regex/config.m4,v retrieving revision 1.3 retrieving revision 1.4 diff -u -u -r1.3 -r1.4 --- config.m4 1999/12/20 03:09:51 1.3 +++ config.m4 1999/12/29 23:52:28 1.4 @@ -1,3 +1,5 @@ +AC_CHECK_FUNCS(memmove) + AC_MSG_CHECKING(whether to use the provided HS regex library) AC_ARG_ENABLE(hsregex, [ --enable-hsregex Use the HS regex library ], @@ -5,6 +7,9 @@ [apache_cv_hsregex=yes]) if test $apache_cv_hsregex = yes; then +if test $ac_cv_func_memmove = no; then +CFLAGS=$CFLAGS -DUSEBCOPY +fi REGEX_LIB=regex/libregex.la REGEX_DIR=regex AC_DEFINE(USE_HSREGEX,, [Define this if HS regex will be used])
cvs commit: apache-2.0/src buildconf
sascha 99/12/29 15:53:15 Modified:src buildconf Log: Fix IFS handling. This has the nice side effect that we do not need tr anymore. Revision ChangesPath 1.10 +4 -3 apache-2.0/src/buildconf Index: buildconf === RCS file: /home/cvs/apache-2.0/src/buildconf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -u -r1.9 -r1.10 --- buildconf 1999/12/22 03:16:37 1.9 +++ buildconf 1999/12/29 23:53:14 1.10 @@ -23,7 +23,8 @@ echoto build APACHE from CVS. exit 1 fi -IFS=.; set $am_version; IFS=' ' +old_IFS=$IFS +IFS=.; set $am_version; IFS=$old_IFS if test $1 = 1 -a $2 -lt 4 || test $1 -lt 1; then echo buildconf: automake version $am_version found. echoYou need automake version 1.4 or newer installed @@ -42,7 +43,7 @@ exit 1 fi lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'` -IFS=.; set $lt_version; IFS=' ' +IFS=.; set $lt_version; IFS=$old_IFS if test $1 -gt 1 || test $2 -gt 3 || test $2 = 3 -a $3 -ge 3 then echo buildconf: libtool version $lt_pversion (ok) @@ -88,7 +89,7 @@ autoheader # find all Makefile.ams -files=Makefile `find ap lib main modules regex os -name Makefile.am | sed 's#\.am##' | tr '\n' ' '` +files=Makefile `find ap lib main modules regex os -name Makefile.am | sed 's#\.am$##'` # suppress stupid automake warning automake --add-missing $automake_flags $files 21 | grep -v \$APACHE_OUTPUT_FILES 2
cvs commit: apache-2.0/src/lib/apr aclocal.m4 configure.in
sascha 99/12/29 15:54:28 Modified:src/lib/apr aclocal.m4 configure.in Log: Add check for socklen_t. Falls back to unsigned int. Revision ChangesPath 1.8 +26 -0 apache-2.0/src/lib/apr/aclocal.m4 Index: aclocal.m4 === RCS file: /home/cvs/apache-2.0/src/lib/apr/aclocal.m4,v retrieving revision 1.7 retrieving revision 1.8 diff -u -u -r1.7 -r1.8 --- aclocal.m41999/12/21 21:16:17 1.7 +++ aclocal.m41999/12/29 23:54:27 1.8 @@ -161,3 +161,29 @@ undefine([AC_CV_NAME])dnl ]) +dnl +dnl check for socklen_t, fall back to unsigned int +dnl + +AC_DEFUN(APR_CHECK_SOCKLEN_T,[ +AC_CACHE_CHECK(for socklen_t, ac_cv_socklen_t,[ +AC_TRY_COMPILE([ +#ifdef HAVE_SYS_TYPES_H +#include sys/types.h +#endif +#ifdef HAVE_SYS_SOCKET_H +#include sys/socket.h +#endif +],[ +socklen_t foo = (socklen_t) 0; +],[ +ac_cv_socklen_t=yes +],[ +ac_cv_socklen_t=no +]) +]) + +if test $ac_cv_socklen_t = no; then + AC_DEFINE(socklen_t, unsigned int, [Whether you have socklen_t]) +fi +]) 1.41 +2 -0 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.40 retrieving revision 1.41 diff -u -u -r1.40 -r1.41 --- configure.in 1999/12/27 23:00:31 1.40 +++ configure.in 1999/12/29 23:54:27 1.41 @@ -306,6 +306,8 @@ AC_FUNC_MMAP AC_FUNC_SETPGRP +APR_CHECK_SOCKLEN_T + if test $ac_cv_func_mmap_fixed_mapped = yes; then mmap=1 AC_SUBST(mmap)
cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h
sascha 99/12/29 15:56:25 Modified:src/lib/apr/network_io/unix networkio.h Log: Use correct data type for socket address length. Revision ChangesPath 1.13 +1 -1 apache-2.0/src/lib/apr/network_io/unix/networkio.h Index: networkio.h === RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -u -r1.12 -r1.13 --- networkio.h 1999/12/14 18:11:08 1.12 +++ networkio.h 1999/12/29 23:56:24 1.13 @@ -111,7 +111,7 @@ int socketdes; struct sockaddr_in *local_addr; struct sockaddr_in *remote_addr; -size_t addr_len; +socklen_t addr_len; int timeout; #ifndef HAVE_POLL int connected;
cvs commit: apache-2.0/src/modules/mpm/prefork prefork.c
sascha 99/12/29 15:57:57 Modified:src/modules/mpm/prefork prefork.c Log: Fall back to save values for SHM_R and SHM_W, if the system does not define them. Revision ChangesPath 1.61 +13 -0 apache-2.0/src/modules/mpm/prefork/prefork.c Index: prefork.c === RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -u -r1.60 -r1.61 --- prefork.c 1999/12/15 21:39:08 1.60 +++ prefork.c 1999/12/29 23:57:53 1.61 @@ -105,7 +105,20 @@ #include sys/types.h #include sys/ipc.h #include sys/shm.h + +/* some systems do not define SHM_[RW]; values are from Unix98 */ + +#ifndef SHM_R +#define SHM_R 0x400 #endif + +#ifndef SHM_W +#define SHM_W 0x200 +#endif + +#endif + + #ifdef HAVE_BSTRING_H #include bstring.h /* for IRIX, FD_SET calls bzero() */
Re: cvs commit: apache-2.0/src/lib/apr Makefile.in
On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote: Ryan Bloom wrote: On Wed, 22 Dec 1999, Ben Laurie wrote: [EMAIL PROTECTED] wrote: ben 99/12/22 03:46:36 Modified:src/lib/apr Makefile.in Log: We now link on FreeBSD 2.2.x. But somewhere recently we've started to require GNU make. When did that happen? Is it APR or Apache that is requiring GNU make? Diagnosed: its the include stuff. You can't say: -include $(DEP_FILES) in BSD make. You have to include them individually with .include and quotemarks... Does that work with GNU make? include filename is the portable version. Works with GNU, BSD, SysV make. -- Regards, Sascha Schumann Consultant
Re: cvs commit: apache-2.0/src/lib/apr Makefile.in
On Wed, Dec 22, 1999 at 06:27:18PM +, Ben Laurie wrote: Sascha Schumann wrote: On Wed, Dec 22, 1999 at 05:52:05PM +, Ben Laurie wrote: Ryan Bloom wrote: On Wed, 22 Dec 1999, Ben Laurie wrote: [EMAIL PROTECTED] wrote: ben 99/12/22 03:46:36 Modified:src/lib/apr Makefile.in Log: We now link on FreeBSD 2.2.x. But somewhere recently we've started to require GNU make. When did that happen? Is it APR or Apache that is requiring GNU make? Diagnosed: its the include stuff. You can't say: -include $(DEP_FILES) in BSD make. You have to include them individually with .include and quotemarks... Does that work with GNU make? include filename is the portable version. Works with GNU, BSD, SysV make. Marvellous. In that case it is automake that is broken. I'm running v1.4. make clean? Yes, that's broken :( -- Regards, Sascha Schumann Consultant
