rbb 99/07/23 07:41:52
Modified: apr Makefile.in acconfig.h configure.in apr/file_io/beos Makefile.in apr/file_io/os2 Makefile.in apr/file_io/unix Makefile.in apr/include apr_config.h.in apr/lib Makefile.in apr/locks/beos Makefile.in apr/locks/os2 Makefile.in apr/locks/unix Makefile.in apr/misc/beos Makefile.in apr/misc/os2 Makefile.in apr/misc/unix Makefile.in start.c apr/network_io/beos Makefile.in apr/network_io/os2 Makefile.in apr/network_io/unix Makefile.in apr/shmem/unix Makefile.in apr/signal/unix Makefile.in apr/test Makefile.in apr/threadproc/beos Makefile.in apr/threadproc/os2 Makefile.in apr/threadproc/unix Makefile.in apr/time/beos Makefile.in apr/time/os2 Makefile.in apr/time/unix Makefile.in Added: apr aclocal.m4 Log: I had some time this morning, so here are the next set of changes for autoconf. Somebody should probably check this on a platform other than Linux. Revision Changes Path 1.15 +5 -4 apache-apr/apr/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.in 1999/07/14 15:31:39 1.14 +++ Makefile.in 1999/07/23 14:41:34 1.15 @@ -9,9 +9,9 @@ @SET_MAKE@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) [EMAIL PROTECTED]@ # # Macros for supporting directories @@ -25,7 +25,8 @@ # MODULES=lib file_io network_io threadproc locks misc time SUBDIRS=lib file_io/@OSDIR@ network_io/@OSDIR@ threadproc/@OSDIR@ \ - locks/@OSDIR@ misc/@OSDIR@ time/@OSDIR@ signal/@OSDIR@ shmem/@OSDIR@ + locks/@OSDIR@ misc/@OSDIR@ time/@OSDIR@ signal/@OSDIR@ +#shmem/@OSDIR@ # # Rules for turning inputs into outputs 1.2 +12 -0 apache-apr/apr/acconfig.h Index: acconfig.h =================================================================== RCS file: /home/cvs/apache-apr/apr/acconfig.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- acconfig.h 1999/07/13 19:51:20 1.1 +++ acconfig.h 1999/07/23 14:41:34 1.2 @@ -2,7 +2,19 @@ #define APR_CONFIG_H @TOP@ +/* Various #defines we need to know about */ #undef HAVE_STRUCT_UNION_SEMUN +#undef HAVE_LOCK_EX +#undef HAVE_F_SETLK +#undef HAVE_PTHREAD_PROCESS_SHARED + +/* Cross process serialization techniques */ +#undef USE_FLOCK_SERIALIZE +#undef USE_SYSVSEM_SERIALIZE +#undef USE_FCNTL_SERIALIZE +#undef USE_PROC_PTHREAD_SERIALIZE +#undef USE_PTHREAD_SERIALIZE + #undef NEED_RLIM_T #undef USEBCOPY 1.30 +37 -66 apache-apr/apr/configure.in Index: configure.in =================================================================== RCS file: /home/cvs/apache-apr/apr/configure.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- configure.in 1999/07/15 12:46:39 1.29 +++ configure.in 1999/07/23 14:41:35 1.30 @@ -1,9 +1,9 @@ AC_CONFIG_AUX_DIR(./helpers) -PLATFORM=`config.guess` -PLATFORM=`config.sub $PLATFORM` +OS=`config.guess` +OS=`config.sub $OS` echo "Configuring APR library" -echo "Platform: ${PLATFORM}" +echo "Platform: ${OS}" dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) @@ -25,7 +25,7 @@ dnl # this is the place to put specific options for platform/compiler dnl # combinations -case "$PLATFORM:$CC" in +case "$OS:$CC" in *-hp-hpux*:cc ) CFAGS="$CFLAGS -Ae +DAportable" ;; esac @@ -55,33 +55,42 @@ fi AC_CHECK_PROG(SH, sh, sh) +AC_CHECK_DEFINE(LOCK_EX, sys/file.h) +AC_CHECK_DEFINE(F_SETLK, fcntl.h) +AC_CHECK_DEFINE(PTHREAD_PROCESS_SHARED, pthread.h) + dnl Checks for libraries. +AC_BEGIN_DECISION([lock implementation method]) +AC_IFALLYES(header:sys/file.h define:LOCK_EX, + AC_DECIDE(USE_FLOCK_SERIALIZE, [4.2BSD-style flock()])) +AC_IFALLYES(header:sys/ipc.h header:sys/sem.h header:sys/file.h dnl + func:semget func:semctl, + AC_DECIDE(USE_SYSVSEM_SERIALIZE, [SysV IPC semget()])) +AC_IFALLYES(header:fcntl.h define:F_SETLK, + AC_DECIDE(USE_FCNTL_SERIALIZE, [SVR4-style fcntl()])) +AC_IFALLYES(header:pthread.h define:PTHREAD_PROCESS_SHARED dnl + custom:use_pthread_cross, + AC_DECIDE(USE_PROC_PTHREAD_SERIALIZE, [pthread mutex])) +AC_DECISION_FORCE(USE_FCNTL_SERIALIZE) +AC_END_DECISION +AC_DEFINE_UNQUOTED($ac_decision) + +AC_USE_FUNCTION(pthread_mutex_init, PTHREAD_SERIALIZE) + +case "$OS" in + *beos*) + OSDIR="beos" + ;; + *) + OSDIR="unix" + ;; +esac -dnl Checks for operating system/platform identity -SYS_HW=`(uname -m) 2>/dev/null` || SYS_HW="unknown" -SYS_VER=`(uname -v) 2>/dev/null` || SYS_VER="unknown" -SYS_SW=`(uname -s) 2>/dev/null` || SYS_SW="unknown" -SYS_REL=`(uname -r) 2>/dev/null` || SYS_REL="unknown" - -if (echo "$SYS_SW" | grep -qi 'Linux'); then - SYS_KV=`echo $SYS_REL | awk -F. '{printf "%s%s", $1, $2}'` - LDLIBS="$LDLIBS -ldl -lpthread" - CFLAGS="$CFLAGS -DUSE_PTHREAD_SERIALIZE -DUSE_FCNTL_SERIALIZE" - PLATFORM="-DLINUX=$SYS_KV" - OSDIR="unix" - case "$SYS_KV" in - 2*) - LDLIBS="$LDLIBS -lm" - ;; - esac -fi +AC_CHECK_LIB(dl, dlopen) +AC_CHECK_LIB(pthread, pthread_mutex_init) if (test "$SYS_SW" = "AIX"); then - SYS_KV=`(oslevel) 2>/dev/null` || SYS_KV="0.0.0.0" - SYS_KV=`echo $SYS_KV | awk -F. '{printf "%s%s%s", $1, $2, $3}'` - CFLAGS="$CFLAGS -U__STR__ -DUSE_PTHREAD_SERIALIZE -DUSE_FCNTL_SERIALIZE" - PLATFORM="-DAIX=$SYS_KV" - OSDIR="unix" + CFLAGS="$CFLAGS -U__STR__" case "$SYS_KV" in [12]*) AC_DEFINE(USEBCOPY) @@ -92,48 +101,11 @@ 41*) AC_DEFINE(NEED_RLIM_T) ;; - 42*) - LDLIBS="$LDLIBS -lm" - ;; - 432) - LDLIBS="$LDLIBS -lm" - ;; - 43*) - LDLIBS="$LDLIBS -lm" - ;; - *) - LDLIBS="$LDLIBS -lm" - ;; esac fi -if (test "$SYS_SW" = "OSF1"); then - PLATFORM="-DOSF1" - OSDIR="unix" -fi - if (test "$SYS_SW" = "FreeBSD"); then - CFLAGS="$CFLAGS -pthread -U__STR__ -DUSE_PTHREAD_SERIALIZE -DUSE_FLOCK_SERIALIZE" - PLATFORM="-DFreeBSD" - OSDIR="unix" -fi - -if (test "$SYS_SW" = "OS/2"); then - PLATFORM="-DOS2" - OSDIR="os2" - LDLIBS="$LDLIBS -lsocket" - LIBPREFIX='' -fi - -if (test "$SYS_SW" = "BeOS"); then - PLATFORM="-DBEOS" - OSDIR="beos" -fi - -dnl Verify that we've determined the platform, or all that follows is pointless -if (test "x$PLATFORM" = "x"); then - echo "** Don't know how to build for platform \"$SYS_SW\"." - exit 1 + CFLAGS="$CFLAGS -pthread -U__STR__" fi dnl Checks for header files. @@ -220,7 +192,6 @@ AC_SUBST(RANLIB) AC_SUBST(AR) AC_SUBST(RM) -AC_SUBST(PLATFORM) AC_SUBST(OSDIR) AC_SUBST(LIBPREFIX) AC_SUBST(EXEEXT) 1.1 apache-apr/apr/aclocal.m4 Index: aclocal.m4 =================================================================== dnl ## dnl ## dnl ## define(AC_USE_FUNCTION,[dnl AC_CHECK_FUNCS($1) if test ".$ac_cv_func_$1" = .yes; then AC_DEFINE(USE_$2) fi ])dnl dnl ## dnl ## dnl ## define(AC_CHECK_DEFINE,[dnl AC_CACHE_CHECK(for $1 in $2, ac_cv_define_$1, AC_EGREP_CPP([YES_IS_DEFINED], [ #include <$2> #ifdef $1 YES_IS_DEFINED #endif ], ac_cv_define_$1=yes; AC_DEFINE(HAVE_$1), ac_cv_define_$1=no) )])dnl dnl ## dnl ## dnl ## define(AC_IFALLYES,[dnl ac_rc=yes for ac_spec in $1; do ac_type=`echo "$ac_spec" | sed -e 's/:.*$//'` ac_item=`echo "$ac_spec" | sed -e 's/^.*://'` case $ac_type in header ) ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` ac_var="ac_cv_header_$ac_item" ;; file ) ac_item=`echo "$ac_item" | sed 'y%./+-%__p_%'` ac_var="ac_cv_file_$ac_item" ;; func ) ac_var="ac_cv_func_$ac_item" ;; define ) ac_var="ac_cv_define_$ac_item" ;; custom ) ac_var="$ac_item" ;; esac eval "ac_val=\$$ac_var" if test ".$ac_val" != .yes; then ac_rc=no break fi done if test ".$ac_rc" = .yes; then : $2 else : $3 fi ])dnl dnl ## dnl ## dnl ## define(AC_BEGIN_DECISION,[dnl ac_decision_item='$1' ac_decision_msg='FAILED' ac_decision='' ])dnl define(AC_DECIDE,[dnl ac_decision='$1' ac_decision_msg='$2' ac_decision_$1=yes ac_decision_$1_msg='$2' ])dnl define(AC_DECISION_OVERRIDE,[dnl ac_decision='' for ac_item in $1; do eval "ac_decision_this=\$ac_decision_${ac_item}" if test ".$ac_decision_this" = .yes; then ac_decision=$ac_item eval "ac_decision_msg=\$ac_decision_${ac_item}_msg" fi done ])dnl define(AC_DECISION_FORCE,[dnl ac_decision="$1" eval "ac_decision_msg=\"\$ac_decision_${ac_decision}_msg\"" ])dnl define(AC_END_DECISION,[dnl if test ".$ac_decision" = .; then echo "[$]0:Error: decision on $ac_decision_item failed" 1>&2 exit 1 else if test ".$ac_decision_msg" = .; then ac_decision_msg="$ac_decision" fi AC_DEFINE($ac_decision_item) AC_MSG_RESULT([decision on $ac_decision_item... $ac_decision_msg]) fi ])dnl 1.2 +3 -3 apache-apr/apr/file_io/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/file_io/beos/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/05/18 13:40:10 1.1 +++ Makefile.in 1999/07/23 14:41:36 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. 1.2 +3 -3 apache-apr/apr/file_io/os2/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/file_io/os2/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/06/04 16:37:46 1.1 +++ Makefile.in 1999/07/23 14:41:36 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. 1.3 +3 -3 apache-apr/apr/file_io/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/file_io/unix/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/06/15 19:43:18 1.2 +++ Makefile.in 1999/07/23 14:41:37 1.3 @@ -6,9 +6,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. 1.12 +21 -0 apache-apr/apr/include/apr_config.h.in Index: apr_config.h.in =================================================================== RCS file: /home/cvs/apache-apr/apr/include/apr_config.h.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- apr_config.h.in 1999/07/13 19:51:23 1.11 +++ apr_config.h.in 1999/07/23 14:41:38 1.12 @@ -39,7 +39,19 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t +/* Various #defines we need to know about */ #undef HAVE_STRUCT_UNION_SEMUN +#undef HAVE_LOCK_EX +#undef HAVE_F_SETLK +#undef HAVE_PTHREAD_PROCESS_SHARED + +/* Cross process serialization techniques */ +#undef USE_FLOCK_SERIALIZE +#undef USE_SYSVSEM_SERIALIZE +#undef USE_FCNTL_SERIALIZE +#undef USE_PROC_PTHREAD_SERIALIZE +#undef USE_PTHREAD_SERIALIZE + #undef NEED_RLIM_T #undef USEBCOPY @@ -67,6 +79,9 @@ /* Define if you have the poll function. */ #undef HAVE_POLL +/* Define if you have the pthread_mutex_init function. */ +#undef HAVE_PTHREAD_MUTEX_INIT + /* Define if you have the setsid function. */ #undef HAVE_SETSID @@ -222,6 +237,12 @@ /* Define if you have the <winsock.h> header file. */ #undef HAVE_WINSOCK_H + +/* Define if you have the dl library (-ldl). */ +#undef HAVE_LIBDL + +/* Define if you have the pthread library (-lpthread). */ +#undef HAVE_LIBPTHREAD #define API_EXPORT(type) type #define API_EXPORT_NONSTD(type) type 1.11 +3 -3 apache-apr/apr/lib/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/lib/Makefile.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Makefile.in 1999/06/10 16:55:58 1.10 +++ Makefile.in 1999/07/23 14:41:38 1.11 @@ -7,9 +7,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../include INCDIR1=../../include INCDIR2=../misc/@OSDIR@ 1.2 +3 -3 apache-apr/apr/locks/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/locks/beos/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/05/18 13:40:16 1.1 +++ Makefile.in 1999/07/23 14:41:39 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/unix 1.3 +3 -3 apache-apr/apr/locks/os2/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/locks/os2/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/06/11 07:22:52 1.2 +++ Makefile.in 1999/07/23 14:41:39 1.3 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/os2 1.3 +3 -3 apache-apr/apr/locks/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/locks/unix/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/06/15 19:43:34 1.2 +++ Makefile.in 1999/07/23 14:41:40 1.3 @@ -6,9 +6,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/unix 1.2 +3 -3 apache-apr/apr/misc/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/misc/beos/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/05/18 13:40:16 1.1 +++ Makefile.in 1999/07/23 14:41:40 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/unix 1.2 +3 -3 apache-apr/apr/misc/os2/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/misc/os2/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/06/04 16:43:00 1.1 +++ Makefile.in 1999/07/23 14:41:41 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/os2 1.6 +3 -3 apache-apr/apr/misc/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/misc/unix/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Makefile.in 1999/06/30 19:45:39 1.5 +++ Makefile.in 1999/07/23 14:41:41 1.6 @@ -6,9 +6,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/unix 1.9 +1 -0 apache-apr/apr/misc/unix/start.c Index: start.c =================================================================== RCS file: /home/cvs/apache-apr/apr/misc/unix/start.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- start.c 1999/06/30 19:45:39 1.8 +++ start.c 1999/07/23 14:41:42 1.9 @@ -58,6 +58,7 @@ #include "apr_pools.h" #include "misc.h" #include <pthread.h> +#include <signal.h> #include <errno.h> #include <string.h> 1.2 +3 -3 apache-apr/apr/network_io/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/network_io/beos/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/05/18 13:40:20 1.1 +++ Makefile.in 1999/07/23 14:41:42 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. 1.2 +3 -3 apache-apr/apr/network_io/os2/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/network_io/os2/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/06/04 16:15:56 1.1 +++ Makefile.in 1999/07/23 14:41:43 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. 1.3 +3 -3 apache-apr/apr/network_io/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/network_io/unix/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/06/15 19:43:42 1.2 +++ Makefile.in 1999/07/23 14:41:43 1.3 @@ -6,9 +6,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. 1.2 +3 -3 apache-apr/apr/shmem/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/shmem/unix/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/07/01 17:48:14 1.1 +++ Makefile.in 1999/07/23 14:41:44 1.2 @@ -6,9 +6,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -Imm -I. 1.2 +3 -3 apache-apr/apr/signal/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/signal/unix/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/06/30 19:45:43 1.1 +++ Makefile.in 1999/07/23 14:41:45 1.2 @@ -6,9 +6,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/unix 1.12 +3 -3 apache-apr/apr/test/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/test/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.in 1999/06/30 19:45:50 1.11 +++ Makefile.in 1999/07/23 14:41:45 1.12 @@ -7,9 +7,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ -LDLIBS=-L../network_io -lnetwork -L../threadproc -lthreadproc -L../file_io -lfile -L../misc -lmisc -L../lib -lapr -L../time -ltime -L../locks -llock -L../signal -lsig @LDLIBS@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ +LIBS=-L../network_io -lnetwork -L../threadproc -lthreadproc -L../file_io -lfile -L../misc -lmisc -L../lib -lapr -L../time -ltime -L../locks -llock -L../signal -lsig @LIBS@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../include INCDIR1=../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) 1.3 +3 -3 apache-apr/apr/threadproc/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/threadproc/beos/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/05/27 19:02:39 1.2 +++ Makefile.in 1999/07/23 14:41:46 1.3 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/@OSDIR@ 1.2 +3 -3 apache-apr/apr/threadproc/os2/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/threadproc/os2/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/06/06 07:15:20 1.1 +++ Makefile.in 1999/07/23 14:41:48 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/os2 1.5 +3 -3 apache-apr/apr/threadproc/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/threadproc/unix/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.in 1999/06/17 15:05:21 1.4 +++ Makefile.in 1999/07/23 14:41:49 1.5 @@ -6,9 +6,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCDIR2=../../file_io/unix 1.2 +3 -3 apache-apr/apr/time/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/time/beos/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/05/18 13:40:21 1.1 +++ Makefile.in 1999/07/23 14:41:50 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. 1.2 +3 -3 apache-apr/apr/time/os2/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/time/os2/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile.in 1999/06/04 14:57:44 1.1 +++ Makefile.in 1999/07/23 14:41:51 1.2 @@ -5,9 +5,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. 1.3 +3 -3 apache-apr/apr/time/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-apr/apr/time/unix/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.in 1999/06/15 19:43:50 1.2 +++ Makefile.in 1999/07/23 14:41:51 1.3 @@ -6,9 +6,9 @@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ @CFLAGS@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LDLIBS) [EMAIL PROTECTED]@ @OPTIM@ [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ $(LIBS) INCDIR=../../include INCDIR1=../../../include INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.