cvs commit: apache/src Configure
martin 98/01/09 06:50:51 Modified:src Tag: APACHE_1_2_X Configure Log: Add XPG/4 switch for ReliantUNIX/SINIX compilation Revision ChangesPath No revision No revision 1.96.2.11 +1 -1 apache/src/Configure Index: Configure === RCS file: /home/cvs/apache/src/Configure,v retrieving revision 1.96.2.10 retrieving revision 1.96.2.11 diff -u -u -r1.96.2.10 -r1.96.2.11 --- Configure 1997/08/21 22:56:20 1.96.2.10 +++ Configure 1998/01/09 14:50:50 1.96.2.11 @@ -424,7 +424,7 @@ ;; *-sni-sysv4*) OS='SVR4' - CFLAGS=$CFLAGS -DSVR4 + CFLAGS=$CFLAGS -DSVR4 -D_XPG_IV -DUSE_MMAP_FILES DEF_WANTHSREGEX=yes LIBS=$LIBS -lsocket -lnsl -lc ;;
cvs commit: apache/src Configure
jim 97/07/24 19:10:47 Modified:src Configure Log: Oops... we should actually check the return value of the ANSI test :) Revision ChangesPath 1.122 +10 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- Configure 1997/07/25 02:03:15 1.121 +++ Configure 1997/07/25 02:10:46 1.122 @@ -704,7 +704,16 @@ # Use TestCompile to see if $(CC) is ANSI # -./helpers/TestCompile ansi +if ./helpers/TestCompile ansi; then +: +else + echo ** A test compilation with your Makefile configuration + echo ** failed. This is mostly like since your C compiler + echo ** is not ANSI. Apache requires an ANSI C Compiler, such + echo ** as gcc. + echo Aborting! + exit 1 +fi # Use TestCompile to look for various LIBS
cvs commit: apache/src Configure
dgaudet 97/07/20 20:42:12 Modified:src Configure Log: Don't print + using for mod_auth_db when DB_LIB=, similarly for DBM_LIB. Fix BSD44 archs which don't require -ldb for db functions. Revision ChangesPath 1.115 +10 -2 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.114 retrieving revision 1.115 diff -C3 -r1.114 -r1.115 *** Configure 1997/07/21 03:37:48 1.114 --- Configure 1997/07/21 03:42:11 1.115 *** *** 299,318 --- 299,322 OS='BSDI w/486' CFLAGS=$CFLAGS -m486 DBM_LIB= + DB_LIB= ;; *-bsdi*) OS='BSDI' DBM_LIB= + DB_LIB= ;; *486-*-freebsd*|*486-*-netbsd*) OS='FreeBSD/NETBSD on 486' LIBS=$LIBS -lcrypt DBM_LIB= + DB_LIB= ;; *-freebsd*|*-netbsd*) OS='FreeBSD/NetBSD' LIBS=$LIBS -lcrypt DBM_LIB= + DB_LIB= ;; *-openbsd*) OS='OpenBSD' *** *** 699,709 # if grep mod_auth_dbm Makefile /dev/null; then LIBS=$LIBS $DBM_LIB ! echo + using $DBM_LIB for mod_auth_dbm fi if grep mod_auth_db Makefile /dev/null; then LIBS=$LIBS $DB_LIB ! echo + using $DB_LIB for mod_auth_db fi --- 703,717 # if grep mod_auth_dbm Makefile /dev/null; then LIBS=$LIBS $DBM_LIB ! if [ X$DBM_LIB != X ]; then ! echo + using $DBM_LIB for mod_auth_dbm ! fi fi if grep mod_auth_db Makefile /dev/null; then LIBS=$LIBS $DB_LIB ! if [ X$DB_LIB != X ]; then ! echo + using $DB_LIB for mod_auth_db ! fi fi
cvs commit: apache/src Configure
jim 97/07/16 20:03:22 Modified:src Configure Log: Show where, in Configure, one would use ./helpers/TestLib Revision ChangesPath 1.111 +21 -12apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.110 retrieving revision 1.111 diff -C3 -r1.110 -r1.111 *** Configure 1997/07/17 01:40:35 1.110 --- Configure 1997/07/17 03:03:20 1.111 *** *** 632,647 fi # - # Are they using dbm/db auth? If so, add DBM/DB library. - # - if grep mod_auth_dbm Makefile /dev/null; then - LIBS=$LIBS $DBM_LIB - fi - if grep mod_auth_db Makefile /dev/null; then - LIBS=$LIBS $DB_LIB - fi - - # # Now HS's POSIX regex implementation if needed/wanted # if [ $RULE_WANTHSREGEX = yes ]; then --- 632,637 *** *** 669,684 fi # ! # FINALLY, finish building Makefile.config # echo CFLAGS1=$CFLAGS Makefile.config echo INCLUDES1=$INCLUDES Makefile.config - echo LIBS1=$LIBS Makefile.config echo LDFLAGS1=$LDFLAGS Makefile.config echo BROKEN_BPRINTF_FLAGS=$OSBPRINTF Makefile.config echo REGLIB=$REGLIB Makefile.config echo RANLIB=$RANLIB Makefile.config echo SHELL=$SHELL Makefile.config echo Makefile.config echo End of Configure created section Makefile.config --- 659,693 fi # ! # FINALLY, finish (with the exception of LIBS) building Makefile.config # echo CFLAGS1=$CFLAGS Makefile.config echo INCLUDES1=$INCLUDES Makefile.config echo LDFLAGS1=$LDFLAGS Makefile.config echo BROKEN_BPRINTF_FLAGS=$OSBPRINTF Makefile.config echo REGLIB=$REGLIB Makefile.config echo RANLIB=$RANLIB Makefile.config echo SHELL=$SHELL Makefile.config + + # + # This would be the area to do any ./helpers/TestLib tests, + # before we actually write LIBS to Makefile.config. + # Punt for now... + + # + # Are they using dbm/db auth? If so, add DBM/DB library. + # + if grep mod_auth_dbm Makefile /dev/null; then + LIBS=$LIBS $DBM_LIB + fi + if grep mod_auth_db Makefile /dev/null; then + LIBS=$LIBS $DB_LIB + fi + + # + # NOW we finish Makefile.config + # + echo LIBS1=$LIBS Makefile.config echo Makefile.config echo End of Configure created section Makefile.config
cvs commit: apache/src Configure Makefile.tmpl
coar97/07/14 03:20:03 Modified:src Configure Makefile.tmpl Log: Put quotes around $(CC) where it's passed to subordinate environments. on IRIX, mod_perl requires -n32, and mucks with the CC macro. This isn't the optimal solution, but it does no harm; hopefully mod_perl can be convinced to Do It Right. Submitted by: Fernando Lopez-Lezcano [EMAIL PROTECTED] Revision ChangesPath 1.108 +1 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.107 retrieving revision 1.108 diff -C3 -r1.107 -r1.108 *** Configure 1997/07/11 03:55:04 1.107 --- Configure 1997/07/14 10:20:00 1.108 *** *** 682,688 @echo Done cleaning module subdirectories placeholder \$(MODULES): ForceMe ! (cd \$@; \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)') ForceMe: --- 682,688 @echo Done cleaning module subdirectories placeholder \$(MODULES): ForceMe ! (cd \$@; \$(MAKE) CC='\$(CC)' AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)') ForceMe: 1.51 +2 -2 apache/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.50 retrieving revision 1.51 diff -C3 -r1.50 -r1.51 *** Makefile.tmpl 1997/06/30 22:26:54 1.50 --- Makefile.tmpl 1997/07/14 10:20:01 1.51 *** *** 29,39 $(CC) $(LDFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS) regex/libregex.a: ! (cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') modules/last-built: (cd modules; \ ! $(MAKE) CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') clean: rm -f httpd *.o core --- 29,39 $(CC) $(LDFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS) regex/libregex.a: ! (cd regex; $(MAKE) lib CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') modules/last-built: (cd modules; \ ! $(MAKE) CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') clean: rm -f httpd *.o core
cvs commit: apache/src Configure
marc97/07/10 20:55:05 Modified:src Configure Log: Improve SNI CFLAGS. Reviewed by: Marc Slemko Submitted by: Martin Kraemer [EMAIL PROTECTED] PR: 851 Revision ChangesPath 1.107 +1 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.106 retrieving revision 1.107 diff -C3 -r1.106 -r1.107 *** Configure 1997/07/10 18:32:46 1.106 --- Configure 1997/07/11 03:55:04 1.107 *** *** 423,429 ;; *-sni-sysv4*) OS='SVR4' ! CFLAGS=$CFLAGS -DSVR4 DEF_WANTHSREGEX=yes LIBS=$LIBS -lsocket -lnsl -lc ;; --- 423,429 ;; *-sni-sysv4*) OS='SVR4' ! CFLAGS=$CFLAGS -DSVR4 -D_XPG_IV -DHAVE_MMAP DEF_WANTHSREGEX=yes LIBS=$LIBS -lsocket -lnsl -lc ;;
cvs commit: apache/src Configure CHANGES
dgaudet 97/06/29 11:28:28 Modified:src Tag: APACHE_1_2_X Configure CHANGES Log: Fix problem with error from hp/ux make when no modules in modules/ dir. Submitted by: Marc Slemko Reviewed by: Dean Gaudet, Alexei Kosut Revision ChangesPath No revision No revision 1.96.2.6 +1 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.96.2.5 retrieving revision 1.96.2.6 diff -C3 -r1.96.2.5 -r1.96.2.6 *** Configure 1997/06/27 02:01:57 1.96.2.5 --- Configure 1997/06/29 18:28:24 1.96.2.6 *** *** 665,671 clean: \$(CLEANERS) @echo Done cleaning module subdirectories ! \$(MODULES): ForceMe (cd \$@; \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)') ForceMe: --- 665,671 clean: \$(CLEANERS) @echo Done cleaning module subdirectories ! placeholder \$(MODULES): ForceMe (cd \$@; \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)' RANLIB='\$(RANLIB)') ForceMe: 1.286.2.21 +3 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.286.2.20 retrieving revision 1.286.2.21 diff -C3 -r1.286.2.20 -r1.286.2.21 *** CHANGES 1997/06/29 18:21:46 1.286.2.20 --- CHANGES 1997/06/29 18:28:26 1.286.2.21 *** *** 29,34 --- 29,37 lockfile in any location. It previously defaulted to /usr/tmp/htlock. [Somehow it took four of us: Randy Terbush, Jim Jagielski, Dean Gaudet, Marc Slemko] + + *) Add a placeholder in modules/Makefile to avoid errors with certain + makes. [Marc Slemko] *) QUERY_STRING was unescaped in mod_include, it shouldn't be. [Dean Gaudet] PR#644
cvs commit: apache/src Configure CHANGES
dgaudet 97/06/26 18:58:18 Modified:src Tag: APACHE_1_2_X Configure CHANGES Log: PR#388: Support for DEC cc compiler under Ultrix. Revision ChangesPath No revision No revision 1.96.2.3 +3 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.96.2.2 retrieving revision 1.96.2.3 diff -C3 -r1.96.2.2 -r1.96.2.3 *** Configure 1997/06/27 01:55:30 1.96.2.2 --- Configure 1997/06/27 01:58:15 1.96.2.3 *** *** 436,441 --- 436,444 CFLAGS=-DULTRIX DEF_WANTHSREGEX=yes SHELL=/bin/sh5 + if [ $CC = cc ] || [ $COMPILER = cc ]; then + CFLAGS=$CFLAGS -std + fi ;; *powerpc-tenon-machten*) OS='MachTen PPC' 1.286.2.5 +3 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.286.2.4 retrieving revision 1.286.2.5 diff -C3 -r1.286.2.4 -r1.286.2.5 *** CHANGES 1997/06/27 01:56:48 1.286.2.4 --- CHANGES 1997/06/27 01:58:16 1.286.2.5 *** *** 1,4 --- 1,7 Changes with Apache 1.2.1 + + *) Support for dec cc compiler under ultrix. + [P. Alejandro Lopez-Valencia [EMAIL PROTECTED]] PR#388 *) Support for Maxion/OS SVR4.2 Real Time Unix. [no name given] PR#383
cvs commit: apache/src Configure
jim 97/04/14 04:52:21
Modified:src Configure
Log:
Final fixes for correct detection of Module
Revision ChangesPath
1.91 +3 -3 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.90
retrieving revision 1.91
diff -C3 -r1.90 -r1.91
*** Configure 1997/04/13 20:54:34 1.90
--- Configure 1997/04/14 11:52:20 1.91
***
*** 598,609
awk modules/Makefile $tmpfile '\
BEGIN {printf MODULES=} \
!($3 ~ /modules\//) {split ($3, pp, /); printf %s , pp[2]} \
END {printf \n}'
awk modules/Makefile $tmpfile '\
BEGIN {printf CLEANERS=} \
!($3 ~ /modules\//) {split ($3, pp, /); printf %s_clean , pp[2]} \
END {printf \n}'
cat EOF modules/Makefile
--- 598,609
awk modules/Makefile $tmpfile '\
BEGIN {printf MODULES=} \
!($1 == Module $3 ~ /modules\//) {split ($3, pp, /); printf %s ,
pp[2]} \
END {printf \n}'
awk modules/Makefile $tmpfile '\
BEGIN {printf CLEANERS=} \
!($1 == Module $3 ~ /modules\//) {split ($3, pp, /); printf
%s_clean , pp[2]} \
END {printf \n}'
cat EOF modules/Makefile
***
*** 622,627
EOF
awk modules/Makefile $tmpfile \
!'($3 ~ /modules\//) { split ($3, pp, /); \
printf %s_clean:\n\t(cd %s; $(MAKE) clean)\n\n, pp[2], pp[2]}'
--- 622,627
EOF
awk modules/Makefile $tmpfile \
!'($1 == Module $3 ~ /modules\//) { split ($3, pp, /); \
printf %s_clean:\n\t(cd %s; $(MAKE) clean)\n\n, pp[2], pp[2]}'
cvs commit: apache/src Configure
jim 97/04/13 13:54:35
Modified:src Configure
Log:
Closeout PR380: Patch is good; check for Module
Revision ChangesPath
1.90 +1 -1 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.89
retrieving revision 1.90
diff -C3 -r1.89 -r1.90
*** Configure 1997/04/13 20:45:33 1.89
--- Configure 1997/04/13 20:54:34 1.90
***
*** 576,582
cat Makefile.config Makefile
sed -e s#@@Configuration@@#$file# $makefile_tmpl Makefile
awk Makefile $tmpfile \
!'($3 ~ /modules\//) { printf %s: modules/last-built ; @cat
/dev/null\n\n, $3, $3}'
cat Makefile.config ../support/Makefile.tmpl ../support/Makefile
cat EOF modules/Makefile
--- 576,582
cat Makefile.config Makefile
sed -e s#@@Configuration@@#$file# $makefile_tmpl Makefile
awk Makefile $tmpfile \
!'($1 == Module $3 ~ /modules\//) { printf %s: modules/last-built ;
@cat /dev/null\n\n, $3, $3}'
cat Makefile.config ../support/Makefile.tmpl ../support/Makefile
cat EOF modules/Makefile
cvs commit: apache/src Configure
dgaudet 97/03/25 12:21:22 Modified:src Configure Log: More bug reporting cleanup. Reviewed by: Dean Gaudet, Jim Jagielski Submitted by: Ken Coar Revision ChangesPath 1.85 +6 -3 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.84 retrieving revision 1.85 diff -C3 -r1.84 -r1.85 *** Configure 1997/03/24 22:49:09 1.84 --- Configure 1997/03/25 20:21:20 1.85 *** *** 420,428 uname -v echo uname -X uname -X ! echo Ideally, read the file PORTING, do what it says and send the ! echo resulting patches to [EMAIL PROTECTED] Otherwise, email ! echo this output to [EMAIL PROTECTED] echo Thank you exit 1 ;; --- 420,431 uname -v echo uname -X uname -X ! echo Ideally, read the file PORTING, do what it says, and send the ! echo resulting patches to The Apache Group by filling out a report ! echo form at http://www.apache.org/bugdb.cgi - or, if your browser ! echo isn\'t forms-capable, you can send them via email to ! echo [EMAIL PROTECTED] If you don\'t wish to do the port ! echo yourself, please submit this output rather than the patches. echo Thank you exit 1 ;;
cvs commit: apache/src Configure
fielding97/03/24 11:03:54
Modified:src Configure
Log:
Replaced for loops in generated modules/Makefile with implicit
rules in order to improve portability.
Reviewed by: Chuck Murcko
Revision ChangesPath
1.83 +20 -13apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.82
retrieving revision 1.83
diff -C3 -r1.82 -r1.83
*** Configure 1997/03/18 10:23:53 1.82
--- Configure 1997/03/24 19:03:53 1.83
***
*** 590,609
awk modules/Makefile $tmpfile '\
BEGIN {printf MODULES=} \
!($3 ~ /modules\//) {split ($3, pp, /); printf %s , pp[2]} \
END {printf \n}'
cat EOF modules/Makefile
! default:
! (for dir in \$(MODULES); do \\
! cd \$\$dir; \\
! \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)'
RANLIB='\$(RANLIB)'; \\
! cd ..; \\
! done)
!
! clean:
! (for dir in \$(MODULES); do \\
! cd \$\$dir; \$(MAKE) clean; \\
! cd ..; \\
! done)
EOF
--- 590,616
awk modules/Makefile $tmpfile '\
BEGIN {printf MODULES=} \
!($3 ~ /modules\//) {split ($3, pp, /); printf %s.build , pp[2]} \
END {printf \n}'
+
+ awk modules/Makefile $tmpfile '\
+BEGIN {printf CLEANERS=} \
+($3 ~ /modules\//) {split ($3, pp, /); printf %s.clean , pp[2]} \
+END {printf \n}'
+
cat EOF modules/Makefile
! default: \$(MODULES)
! @echo done building module subdirectories
!
! clean: \$(CLEANERS)
! @echo done cleaning module subdirectories
!
! .SUFFIXES: .build .clean
!
! \$(MODULES):
! (cd \$*; \$(MAKE) CC=\$(CC) AUX_CFLAGS='\$(MOD_CFLAGS)'
RANLIB='\$(RANLIB)')
!
! \$(CLEANERS):
! (cd \$*; \$(MAKE) clean)
EOF
cvs commit: apache/src Configure PORTING conf.h http_main.c
jim 97/02/25 13:04:46
Modified:src Configure PORTING conf.h http_main.c
Log:
MachTen fine tuning
Revision ChangesPath
1.81 +7 -2 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.80
retrieving revision 1.81
diff -C3 -r1.80 -r1.81
*** Configure 1997/02/25 20:56:38 1.80
--- Configure 1997/02/25 21:04:41 1.81
***
*** 389,396
DEF_WANTHSREGEX=yes
;;
*powerpc-tenon-machten*)
! OS='MachTen'
! LFLAGS=$LFLAGS -Xlstack=131072 -Xldelcsect
;;
*convex-v11*)
OS='CONVEXOS11'
--- 389,401
DEF_WANTHSREGEX=yes
;;
*powerpc-tenon-machten*)
! OS='MachTen PPC'
! LFLAGS=$LFLAGS -Xlstack=0x14000 -Xldelcsect
! ;;
! *-machten*)
! OS='MachTen 68K'
! LFLAGS=$LFLAGS -stack 0x14000
! DEF_WANTHSREGEX=yes
;;
*convex-v11*)
OS='CONVEXOS11'
1.4 +1 -0 apache/src/PORTING
Index: PORTING
===
RCS file: /export/home/cvs/apache/src/PORTING,v
retrieving revision 1.3
retrieving revision 1.4
diff -C3 -r1.3 -r1.4
*** PORTING 1997/01/18 19:17:20 1.3
--- PORTING 1997/02/25 21:04:42 1.4
***
*** 211,216
--- 211,217
USE_LONGJMP:
use the longjmp() call instead of siglongjmp()
+ (as well as setjmp() instead of sigsetjmp())
--
1.85 +4 -1 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -C3 -r1.84 -r1.85
*** conf.h1997/02/22 01:47:30 1.84
--- conf.h1997/02/25 21:04:42 1.85
***
*** 246,251
--- 246,252
#define waitpid(a,b,c) wait4((a) == -1 ? 0 : (a),(union wait *)(b),c,NULL)
typedef int pid_t;
#define JMP_BUF jmp_buf
+ #define USE_LONGJMP
#define NO_USE_SIGACTION
#elif defined(LINUX)
***
*** 455,469
#define JMP_BUF sigjmp_buf
#undef NO_KILLPG
#define NO_SETSID
! #define HAS_GMTOFF
#ifndef __MACHTEN_PPC__
#ifndef __MACHTEN_68K__
#define __MACHTEN_68K__
#endif
#define FLOCK_SERIALIZED_ACCEPT
#define NO_USE_SIGACTION
#undef NEED_STRDUP
#else
#define FCNTL_SERIALIZED_ACCEPT
#endif
--- 456,472
#define JMP_BUF sigjmp_buf
#undef NO_KILLPG
#define NO_SETSID
! #define HAVE_GMTOFF
#ifndef __MACHTEN_PPC__
#ifndef __MACHTEN_68K__
#define __MACHTEN_68K__
#endif
#define FLOCK_SERIALIZED_ACCEPT
#define NO_USE_SIGACTION
+ #define USE_LONGJMP
#undef NEED_STRDUP
#else
+ #define HAVE_SHMGET
#define FCNTL_SERIALIZED_ACCEPT
#endif
1.125 +9 -9 apache/src/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apache/src/http_main.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -C3 -r1.124 -r1.125
*** http_main.c 1997/02/20 03:20:18 1.124
--- http_main.c 1997/02/25 21:04:43 1.125
***
*** 436,442
}
if (!current_conn) {
! #if defined(NEXT) || defined(USE_LONGJMP)
longjmp(jmpbuffer,1);
#else
siglongjmp(jmpbuffer,1);
--- 436,442
}
if (!current_conn) {
! #if defined(USE_LONGJMP)
longjmp(jmpbuffer,1);
#else
siglongjmp(jmpbuffer,1);
***
*** 477,483
bclose(timeout_req-connection-client);
if (!standalone) exit(0);
! #if defined(NEXT) || defined(USE_LONGJMP)
longjmp(jmpbuffer,1);
#else
siglongjmp(jmpbuffer,1);
--- 477,483
bclose(timeout_req-connection-client);
if (!standalone) exit(0);
! #if defined(USE_LONGJMP)
longjmp(jmpbuffer,1);
#else
siglongjmp(jmpbuffer,1);
***
*** 1139,1145
static JMP_BUF wait_timeout_buf;
static void longjmp_out_of_alarm (int sig) {
! #if defined(NEXT) || defined(USE_LONGJMP)
longjmp (wait_timeout_buf, 1);
#else
siglongjmp (wait_timeout_buf, 1);
--- 1139,1145
static JMP_BUF wait_timeout_buf;
static void longjmp_out_of_alarm (int sig) {
! #if defined(USE_LONGJMP)
longjmp (wait_timeout_buf, 1);
#else
siglongjmp (wait_timeout_buf, 1);
***
*** 1153,1159
static int ntimes;
#endif
! #if defined(NEXT)
if (setjmp(wait_timeout_buf) != 0) {
#else
if
cvs commit: apache/src Configure
jim 97/02/15 13:54:32 Modified:src Configure Log: Revision ChangesPath 1.79 +1 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.78 retrieving revision 1.79 diff -C3 -r1.78 -r1.79 *** Configure 1997/02/11 13:22:04 1.78 --- Configure 1997/02/15 21:54:31 1.79 *** *** 194,199 --- 194,200 *-dg-dgux*) OS='DG/UX 5.4' CFLAGS=$CFLAGS -DDGUX + DEF_WANTHSREGEX=yes ;; *OS/2*) DEF_WANTHSREGEX=yes
cvs commit: apache/src Configure
jim 97/02/11 05:22:05 Modified:src Configure Log: remove CC test for HP Revision ChangesPath 1.78 +3 -3 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.77 retrieving revision 1.78 diff -C3 -r1.77 -r1.78 *** Configure 1997/02/10 21:22:19 1.77 --- Configure 1997/02/11 13:22:04 1.78 *** *** 206,212 OS='HI-UX' CFLAGS=$CFLAGS -DHIUX # if we're using the HIUX compiler, add a few flags. ! if [ ! $CC -o $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HIUX_SOURCE fi ;; --- 206,212 OS='HI-UX' CFLAGS=$CFLAGS -DHIUX # if we're using the HIUX compiler, add a few flags. ! if [ $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HIUX_SOURCE fi ;; *** *** 214,227 OS='HP-UX 10' CFLAGS=$CFLAGS -DHPUX10 # if we're using the HPUX compiler, add a few flags. ! if [ ! $CC -o $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE fi ;; *-hp-hpux*) OS='HP-UX' CFLAGS=$CFLAGS -DHPUX ! if [ ! $CC -o $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE fi ;; --- 214,227 OS='HP-UX 10' CFLAGS=$CFLAGS -DHPUX10 # if we're using the HPUX compiler, add a few flags. ! if [ $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE fi ;; *-hp-hpux*) OS='HP-UX' CFLAGS=$CFLAGS -DHPUX ! if [ $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE fi ;;
cvs commit: apache/src Configure
pcs 97/02/06 06:09:56 Modified:src Configure Log: Reviewed by: Brian Behlendorf, Chuck Murcko, Roy T. Fielding Auto-create a Makefile in the support directory: update Configure to write out the configured information to Makefile.config then prepend that to the Makefile.tmpl in both src and support. Revision ChangesPath 1.76 +20 -17apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.75 retrieving revision 1.76 diff -C3 -r1.75 -r1.76 *** Configure 1997/02/04 23:54:22 1.75 --- Configure 1997/02/06 14:09:55 1.76 *** *** 426,435 # Show the final values of the rules ! echo # Platform: $OS Makefile ! echo # Final Rules: Makefile ! echo # Rule WANTHSREGEX=$RULE_WANTHSREGEX Makefile ! echo ### Makefile # # Now that _that's_ done, get on with it --- 426,436 # Show the final values of the rules ! echo ### Makefile.config ! echo # Platform: $OS Makefile.config ! echo # Final Rules: Makefile.config ! echo # Rule WANTHSREGEX=$RULE_WANTHSREGEX Makefile.config ! echo ### Makefile.config # # Now that _that's_ done, get on with it *** *** 532,552 # echo Makefile if [ x$CC != x ]; then ! echo CC=$CC Makefile fi if [ x$OPTIM != x ]; then ! echo OPTIM=$OPTIM Makefile fi ! echo CFLAGS1=$CFLAGS Makefile ! echo INCLUDES1=$INCLUDES Makefile ! echo LIBS1=$LIBS Makefile ! echo LFLAGS1=$LFLAGS Makefile ! echo BROKEN_BPRINTF_FLAGS=$OSBPRINTF Makefile ! echo REGLIB=$REGLIB Makefile ! echo RANLIB=$RANLIB Makefile ! echo Makefile ! echo End of Configure created section Makefile ! echo Makefile - cat $makefile_tmpl Makefile --- 533,555 # echo Makefile if [ x$CC != x ]; then ! echo CC=$CC Makefile.config fi if [ x$OPTIM != x ]; then ! echo OPTIM=$OPTIM Makefile.config fi ! echo CFLAGS1=$CFLAGS Makefile.config ! echo INCLUDES1=$INCLUDES Makefile.config ! echo LIBS1=$LIBS Makefile.config ! echo LFLAGS1=$LFLAGS Makefile.config ! echo BROKEN_BPRINTF_FLAGS=$OSBPRINTF Makefile.config ! echo REGLIB=$REGLIB Makefile.config ! echo RANLIB=$RANLIB Makefile.config ! echo Makefile.config ! echo End of Configure created section Makefile.config + # Now (finish) creating the makefiles + cat Makefile.config Makefile + cat $makefile_tmpl Makefile + cat Makefile.config ../support/Makefile.tmpl ../support/Makefile
cvs commit: apache/src Configure
jim 97/01/22 11:46:42
Modified:src Configure
Log:
Configure patches: Fix OSF, SCO3 and 8space-tab
Revision ChangesPath
1.73 +41 -39apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.72
retrieving revision 1.73
diff -C3 -r1.72 -r1.73
*** Configure 1997/01/21 14:28:44 1.72
--- Configure 1997/01/22 19:46:40 1.73
***
*** 72,99
/^Module/ { modules[n++] = $2 ; pmodules[pn++] = $2 } \
/^%Module/ { pmodules[pn++] = $2 } \
END { print /* modules.c --- automatically generated by Apache; \
! print * configuration script. DO NOT HAND EDIT!; \
! print */; \
! print ; \
print #include \httpd.h\; \
print #include \http_config.h\; \
! print ; \
! for (i = 0; i pn; ++i) { \
! printf (extern module %s_module;\n, pmodules[i]); \
! } \
! print ; \
! print module *prelinked_modules[] = {; \
! for (i = 0; i n; ++i) { \
! printf %s_module,\n, modules[i]; \
! } \
print NULL; \
! print };; \
! print module *preloaded_modules[] = {; \
! for (i = 0; i pn; ++i) { \
! printf %s_module,\n, pmodules[i]; \
! } \
print NULL; \
! print };; \
}'
#
--- 72,99
/^Module/ { modules[n++] = $2 ; pmodules[pn++] = $2 } \
/^%Module/ { pmodules[pn++] = $2 } \
END { print /* modules.c --- automatically generated by Apache; \
! print * configuration script. DO NOT HAND EDIT!; \
! print */; \
! print ; \
print #include \httpd.h\; \
print #include \http_config.h\; \
! print ; \
! for (i = 0; i pn; ++i) { \
! printf (extern module %s_module;\n, pmodules[i]); \
! } \
! print ; \
! print module *prelinked_modules[] = {; \
! for (i = 0; i n; ++i) { \
! printf %s_module,\n, modules[i]; \
! } \
print NULL; \
! print };; \
! print module *preloaded_modules[] = {; \
! for (i = 0; i pn; ++i) { \
! printf %s_module,\n, pmodules[i]; \
! } \
print NULL; \
! print };; \
}'
#
***
*** 110,127
/^Module/ { modules[n++] = $3 } \
/^%Module/ { modules[n++] = $3 } \
END { print MODULES=\\; \
! for (i = 0; i n; ++i) { \
! if (i n-1) printf ( %s \\\n, modules[i]); \
! else printf ( %s\n, modules[i]); \
! } \
! print \
}'
#
# Now add Makefile additions and Rules
#
awk Makefile $tmpfile '\
BEGIN { print # Makefile options inherited from Configure; \
! print ###; \
} \
/\=/ { print } \
END { print ###; }'
--- 110,127
/^Module/ { modules[n++] = $3 } \
/^%Module/ { modules[n++] = $3 } \
END { print MODULES=\\; \
! for (i = 0; i n; ++i) { \
! if (i n-1) printf ( %s \\\n, modules[i]); \
! else printf ( %s\n, modules[i]); \
! } \
! print \
}'
#
# Now add Makefile additions and Rules
#
awk Makefile $tmpfile '\
BEGIN { print # Makefile options inherited from Configure; \
! print ###; \
} \
/\=/ { print } \
END { print ###; }'
***
*** 181,189
CFLAGS=$CFLAGS -DDGUX
;;
*OS/2*)
! DEF_WANTHSREGEX=yes
OS='EMX OS/2'
! CFLAGS=$CFLAGS -Zbsd-signals -Zbin-files -DTCPIPV4 -g
LIBS=$LIBS -lsocket -llibufc -lbsd
DBM_LIB=-lgdbm
;;
--- 181,189
CFLAGS=$CFLAGS -DDGUX
;;
*OS/2*)
! DEF_WANTHSREGEX=yes
OS='EMX OS/2'
! CFLAGS=$CFLAGS -Zbsd-signals -Zbin-files -DTCPIPV4 -g
LIBS=$LIBS -lsocket -llibufc -lbsd
DBM_LIB=-lgdbm
;;
***
*** 209,215
CFLAGS=$CFLAGS -n32
LFLAGS=$LFLAGS -n32
DEF_WANTHSREGEX=yes
! DBM_LIB=
if [ $RULE_IRIXNIS = yes ]; then
OS='SGI IRIX w/NIS'
CFLAGS=$CFLAGS -DIRIX
--- 209,215
CFLAGS=$CFLAGS -n32
LFLAGS=$LFLAGS -n32
DEF_WANTHSREGEX=yes
! DBM_LIB=
if [ $RULE_IRIXNIS = yes ]; then
OS='SGI IRIX w/NIS'
CFLAGS=$CFLAGS -DIRIX
***
*** 221,227
;;
*-sgi-irix)
DEF_WANTHSREGEX=yes
! DBM_LIB=
if [ $RULE_IRIXNIS = yes ]; then
OS='SGI IRIX w/NIS'
CFLAGS=$CFLAGS -DIRIX
--- 221,227
cvs commit: apache/src Configure conf.h http_log.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_rewrite.c util_script.c
brian 97/01/10 01:34:49 Modified:src Configure conf.h http_log.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_rewrite.c util_script.c Log: Reviewed by: Brian Behlendorf Submitted by: Garey Smiley [EMAIL PROTECTED] OS/2 compatibility fixes. Revision ChangesPath 1.67 +2 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.66 retrieving revision 1.67 diff -C3 -r1.66 -r1.67 *** Configure 1997/01/08 13:04:45 1.66 --- Configure 1997/01/10 09:34:40 1.67 *** *** 179,185 DEF_WANTHSREGEX=yes OS='EMX OS/2' CFLAGS=$CFLAGS -Zbsd-signals -Zbin-files -DTCPIPV4 -g ! LIBS=$LIBS -lsocket -llibufc -lgdbm -lbsd ;; *-hp-hpux10.*) OS='HP-UX 10' --- 179,186 DEF_WANTHSREGEX=yes OS='EMX OS/2' CFLAGS=$CFLAGS -Zbsd-signals -Zbin-files -DTCPIPV4 -g ! LIBS=$LIBS -lsocket -llibufc -lbsd ! DBM_LIB=-lgdbm ;; *-hp-hpux10.*) OS='HP-UX 10' 1.67 +3 -1 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.66 retrieving revision 1.67 diff -C3 -r1.66 -r1.67 *** conf.h1997/01/08 13:04:45 1.66 --- conf.h1997/01/10 09:34:41 1.67 *** *** 409,415 #define chdir _chdir2 #include sys/time.h #define MAXSOCKETS 4096 - #define ARG_MAX_POSIX_ARG_MAX #define HAVE_MMAP #elif defined(__MACHTEN__) --- 409,414 *** *** 552,558 --- 551,560 #endif #ifndef S_ISLNK + #ifndef __EMX__ + /* Don't define this for OS/2 */ #define S_ISLNK(m) (((m) S_IFMT) == S_IFLNK) + #endif #endif #ifndef INADDR_NONE 1.12 +5 -0 apache/src/http_log.c Index: http_log.c === RCS file: /export/home/cvs/apache/src/http_log.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C3 -r1.11 -r1.12 *** http_log.c1997/01/01 18:10:18 1.11 --- http_log.c1997/01/10 09:34:41 1.12 *** *** 74,80 --- 74,85 cleanup_for_exec(); signal (SIGHUP, SIG_IGN); + #ifdef __EMX__ + /* For OS/2 we need to use a '/' */ + execl (SHELL_PATH, SHELL_PATH, /c, (char *)cmd, NULL); + #else execl (SHELL_PATH, SHELL_PATH, -c, (char *)cmd, NULL); + #endif exit (1); } 1.8 +5 -0 apache/src/mod_log_agent.c Index: mod_log_agent.c === RCS file: /export/home/cvs/apache/src/mod_log_agent.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C3 -r1.7 -r1.8 *** mod_log_agent.c 1997/01/01 18:10:36 1.7 --- mod_log_agent.c 1997/01/10 09:34:42 1.8 *** *** 105,111 --- 105,116 cleanup_for_exec(); signal (SIGHUP, SIG_IGN); + #ifdef __EMX__ + /* For OS/2 we need to use a '/' */ + execl (SHELL_PATH, SHELL_PATH, /c, (char *)cmd, NULL); + #else execl (SHELL_PATH, SHELL_PATH, -c, (char *)cmd, NULL); + #endif exit (1); } 1.20 +5 -0 apache/src/mod_log_config.c Index: mod_log_config.c === RCS file: /export/home/cvs/apache/src/mod_log_config.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C3 -r1.19 -r1.20 *** mod_log_config.c 1997/01/01 18:10:36 1.19 --- mod_log_config.c 1997/01/10 09:34:42 1.20 *** *** 673,679 --- 673,684 cleanup_for_exec(); signal (SIGHUP, SIG_IGN); + #ifdef __EMX__ + /* For OS/2 we need to use a '/' */ + execl (SHELL_PATH, SHELL_PATH, /c, (char *)cmd, NULL); + #else execl (SHELL_PATH, SHELL_PATH, -c, (char *)cmd, NULL); + #endif fprintf (stderr, Exec of shell for logging failed!!!\n); exit (1); } 1.9 +5 -0 apache/src/mod_log_referer.c Index: mod_log_referer.c === RCS file: /export/home/cvs/apache/src/mod_log_referer.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C3 -r1.8 -r1.9 *** mod_log_referer.c 1997/01/01 18:10:37 1.8 --- mod_log_referer.c 1997/01/10 09:34:43 1.9 *** *** 119,125 --- 119,130 cleanup_for_exec(); signal (SIGHUP, SIG_IGN); + #ifdef __EMX__ +
cvs commit: apache/src Configure conf.h
jim 97/01/10 05:23:32 Modified:src Configure conf.h Log: Add IBM AIX PS/2 Revision ChangesPath 1.70 +5 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.69 retrieving revision 1.70 diff -C3 -r1.69 -r1.70 *** Configure 1997/01/10 11:20:41 1.69 --- Configure 1997/01/10 13:23:30 1.70 *** *** 163,168 --- 163,173 LFLAGS=$LFLAGS -s DEF_WANTHSREGEX=no ;; + i386-ibm-aix*) + OS='IBM AIX PS/2' + CFLAGS=$CFLAGS -DAIX -U__STR__ -DUSEBCOPY + DEF_WANTHSREGEX=no + ;; *-ibm-aix*) OS='IBM AIX' CFLAGS=$CFLAGS -DAIX -U__STR__ 1.69 +3 -1 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.68 retrieving revision 1.69 diff -C3 -r1.68 -r1.69 *** conf.h1997/01/10 11:20:41 1.68 --- conf.h1997/01/10 13:23:31 1.69 *** *** 118,126 #undef NO_SETSID #define HAVE_SYS_SELECT_H #define JMP_BUF sigjmp_buf #define HAVE_MMAP - #define DEFAULT_USER nobody #define DEFAULT_GROUP nobody typedef int rlim_t; #elif defined(ULTRIX) --- 118,128 #undef NO_SETSID #define HAVE_SYS_SELECT_H #define JMP_BUF sigjmp_buf + #ifndef __ps2__ #define HAVE_MMAP #define DEFAULT_GROUP nobody + #endif + #define DEFAULT_USER nobody typedef int rlim_t; #elif defined(ULTRIX)
cvs commit: apache/src Configure
jim 96/12/27 06:30:30
Modified:src Configure
Log:
Fix Configure and use of awk
Revision ChangesPath
1.62 +8 -6 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.61
retrieving revision 1.62
diff -C3 -r1.61 -r1.62
*** Configure 1996/12/26 19:21:43 1.61
--- Configure 1996/12/27 14:30:29 1.62
***
*** 99,110
#
# Add module set only
#
! awk Makefile $tmpfile '\
!BEGIN { printf # Makefile automatically generated from %s\n,
$makefile_tmpl; \
!print # and configuration file by Apache config script. ; \
!print # Hand-edited changes will be lost if the config script; \
!print # is re-run.; \
! } \
/^Module/ { modules[n++] = $3 } \
/^%Module/ { modules[n++] = $3 } \
END { print MODULES=\\; \
--- 99,112
#
# Add module set only
#
! echo # Makefile
! echo # Makefile automatically generated from $makefile_tmpl Makefile
! echo # and configuration file by Apache config script. Makefile
! echo # Hand-edited changes will be lost if the config script Makefile
! echo # is re-run Makefile
! echo # Makefile
!
! awk Makefile $tmpfile '\
/^Module/ { modules[n++] = $3 } \
/^%Module/ { modules[n++] = $3 } \
END { print MODULES=\\; \
cvs commit: apache/src Configure util_script.c util_script.h
randy 96/12/26 11:07:10
Modified:src Configure util_script.c util_script.h
Log:
Revert to a more sane solution for ARG_MAX define in create_argv().
Include a fixe to Configure which solves incompatibilty with 'awk'
on Solaris and I suspect others. (-v was the culprit)
Revision ChangesPath
1.59 +2 -2 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.58
retrieving revision 1.59
diff -C3 -r1.58 -r1.59
*** Configure 1996/12/17 20:21:39 1.58
--- Configure 1996/12/26 19:07:04 1.59
***
*** 91,98
#
# Add module set only
#
! awk -v make=$makefile_tmpl Makefile $tmpfile '\
!BEGIN { printf # Makefile automatically generated from %s\n, make; \
print # and configuration file by Apache config script. ; \
print # Hand-edited changes will be lost if the config script; \
print # is re-run.; \
--- 91,98
#
# Add module set only
#
! awk Makefile $tmpfile '\
!BEGIN { printf # Makefile automatically generated from %s\n,
$makefile_tmpl; \
print # and configuration file by Apache config script. ; \
print # Hand-edited changes will be lost if the config script; \
print # is re-run.; \
1.34 +1 -2 apache/src/util_script.c
Index: util_script.c
===
RCS file: /export/home/cvs/apache/src/util_script.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C3 -r1.33 -r1.34
*** util_script.c 1996/12/26 17:36:23 1.33
--- util_script.c 1996/12/26 19:07:05 1.34
***
*** 60,66
#include http_core.h /* For document_root. Sigh... */
#include http_request.h /* for sub_req_lookup_uri() */
#include util_script.h
- #include limits.h
/*
* Various utility functions which are common to a whole lot of
--- 60,65
***
*** 79,85
char *t, *arg;
va_list args;
! if ((av = (char **)palloc(r-pool, _POSIX_ARG_MAX)) == NULL)
log_unixerr(malloc, NULL, failed to allocate memory for arg list,
r-server);
av[0] = av0;
--- 78,84
char *t, *arg;
va_list args;
! if ((av = (char **)palloc(r-pool, APACHE_ARG_MAX)) == NULL)
log_unixerr(malloc, NULL, failed to allocate memory for arg list,
r-server);
av[0] = av0;
1.12 +6 -0 apache/src/util_script.h
Index: util_script.h
===
RCS file: /export/home/cvs/apache/src/util_script.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C3 -r1.11 -r1.12
*** util_script.h 1996/12/24 18:23:18 1.11
--- util_script.h 1996/12/26 19:07:06 1.12
***
*** 50,55
--- 50,61
*
*/
+ #ifdef _POSIX_ARG_MAX
+ #define APACHE_ARG_MAX _POSIX_ARG_MAX
+ #else
+ #define APACHE_ARG_MAX 512
+ #endif
+
char **create_argv(request_rec *r, char *av0, ...);
#ifdef __EMX__
char **create_argv_cmd(pool *p, char *av0, const char *args, char *path);
cvs commit: apache/src Configure
randy 96/12/26 11:21:44 Modified:src Configure Log: Thinking in small steps today. Add the same error checking for -file Revision ChangesPath 1.61 +4 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.60 retrieving revision 1.61 diff -C3 -r1.60 -r1.61 *** Configure 1996/12/26 19:18:52 1.60 --- Configure 1996/12/26 19:21:43 1.61 *** *** 21,26 --- 21,30 while [ x$1 != x ]; do if [ x$1 = x-file ] ; then shift 1; file=$1; shift 1 + if [ ! -r $file ]; then + echo $file does not exist or is not readable. + exit 1 + fi elif [ x$1 = x-make ] ; then shift 1; makefile_tmpl=$1; shift 1 if [ ! -r $makefile_tmpl ]; then
cvs commit: apache/src Configure
randy 96/12/17 12:21:41
Modified:src Configure
Log:
Add more flexibility to the configuration process.
Reviewed by: Randy Terbush, Sameer Parekh, Ben Laurie
Submitted by: Rob Hartill
Revision ChangesPath
1.58 +16 -9 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.57
retrieving revision 1.58
diff -C3 -r1.57 -r1.58
*** Configure 1996/12/12 00:30:37 1.57
--- Configure 1996/12/17 20:21:39 1.58
***
*** 16,28
file=Configuration
tmpfile=htconf.$$
! if [ x$1 = x-file ] ; then
! echo Using alternate config file $2
! file=$2
! else
! echo Using '$file' as config file
! fi
if [ ! -r $file ]; then
echo Can't see or read \$file\
--- 16,35
file=Configuration
tmpfile=htconf.$$
+ makefile_tmpl=Makefile.tmpl
! while [ x$1 != x ]; do
! if [ x$1 = x-file ] ; then
! shift 1; file=$1; shift 1
! elif [ x$1 = x-make ] ; then
! shift 1; makefile_tmpl=$1; shift 1
! else
! echo Ignoring command line option '$1'
! shift 1
! fi
! done
! echo Using config file: $file
! echo Using Makefile template file: $makefile_tmpl
if [ ! -r $file ]; then
echo Can't see or read \$file\
***
*** 84,91
#
# Add module set only
#
! awk Makefile $tmpfile '\
!BEGIN { print # Makefile automatically generated from Makefile.tmpl; \
print # and configuration file by Apache config script. ; \
print # Hand-edited changes will be lost if the config script; \
print # is re-run.; \
--- 91,98
#
# Add module set only
#
! awk -v make=$makefile_tmpl Makefile $tmpfile '\
!BEGIN { printf # Makefile automatically generated from %s\n, make; \
print # and configuration file by Apache config script. ; \
print # Hand-edited changes will be lost if the config script; \
print # is re-run.; \
***
*** 485,489
echo End of Configure created section Makefile
echo Makefile
! cat Makefile.tmpl Makefile
--- 492,496
echo End of Configure created section Makefile
echo Makefile
! cat $makefile_tmpl Makefile
cvs commit: apache/src Configure
brian 96/12/11 16:30:38 Modified:src Configure Log: Submitted by: Colin Burgess [EMAIL PROTECTED] QNX needs Apache's regex libs. Revision ChangesPath 1.57 +2 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.56 retrieving revision 1.57 diff -C3 -r1.56 -r1.57 *** Configure 1996/12/11 13:48:57 1.56 --- Configure 1996/12/12 00:30:37 1.57 *** *** 245,259 CFLAGS=$CFLAGS -DOSF1 ;; *-qnx) - DEF_WANTHSREGEX=yes OS='QNX' CFLAGS=$CFLAGS -DQNX LIBS=$LIBS -N128k -lsocket ;; *-qnx32) OS='QNX32' CFLAGS=$CFLAGS -DQNX -mf -3 LIBS=$LIBS -N128k -lsocket ;; *-sco3*) OS='SCO 3' --- 245,260 CFLAGS=$CFLAGS -DOSF1 ;; *-qnx) OS='QNX' CFLAGS=$CFLAGS -DQNX LIBS=$LIBS -N128k -lsocket + DEF_WANTHSREGEX=yes ;; *-qnx32) OS='QNX32' CFLAGS=$CFLAGS -DQNX -mf -3 LIBS=$LIBS -N128k -lsocket + DEF_WANTHSREGEX=yes ;; *-sco3*) OS='SCO 3'
cvs commit: apache/src Configure conf.h CHANGES
brian 96/12/10 12:12:33 Modified:src Configure conf.h CHANGES Log: Reviewed by: Brian Behlendorf Submitted by: [EMAIL PROTECTED], Alvin Austin [EMAIL PROTECTED] Allow NeXT to compile cleanly. Revision ChangesPath 1.53 +1 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.52 retrieving revision 1.53 diff -C3 -r1.52 -r1.53 *** Configure 1996/12/10 19:53:17 1.52 --- Configure 1996/12/10 20:12:28 1.53 *** *** 235,240 --- 235,241 *-next-nextstep*) OS='NeXT' CFLAGS=$CFLAGS -DNEXT + DEF_WANTHSREGEX=yes ;; *-dec-osf*) OS='DEC OSF/1' 1.58 +4 -0 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.57 retrieving revision 1.58 diff -C3 -r1.57 -r1.58 *** conf.h1996/12/10 15:07:41 1.57 --- conf.h1996/12/10 20:12:30 1.58 *** *** 193,198 --- 193,202 #endif #ifndef S_IWOTH #define S_IWOTH 02 + #ifndef rlim_t + typedef int rlim_t; + #endif + typedef u_long n_long; #endif #define STDIN_FILENO 0 1.83 +2 -0 apache/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.82 retrieving revision 1.83 diff -C3 -r1.82 -r1.83 *** CHANGES 1996/12/10 15:07:41 1.82 --- CHANGES 1996/12/10 20:12:31 1.83 *** *** 2,7 --- 2,9 *) Remove rlim_t typedef for NetBSD. Do older versions need this? + *) Defined rlim_t and WANTHSREGEX=yes for NeXT. + Changes with Apache 1.2b2: *) Update set_signals() to use sigaction() for setting handlers.
cvs commit: apache/src Configure
brian 96/12/10 12:38:20 Modified:src Configure Log: Submitted by: Erik Bertelsen [EMAIL PROTECTED] Ultrix needs HS's regex package. Revision ChangesPath 1.54 +1 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.53 retrieving revision 1.54 diff -C3 -r1.53 -r1.54 *** Configure 1996/12/10 20:12:28 1.53 --- Configure 1996/12/10 20:38:18 1.54 *** *** 311,316 --- 311,317 *-ultrix) OS='ULTRIX' CFLAGS=-DULTRIX + DEF_WANTHSREGEX=yes ;; *) # default: Catch systems we don't know about echo Sorry, but we cannot grok \$PLAT\
cvs commit: apache/src Configure
jim 96/12/08 15:54:51 Modified:src Configure Log: Back off SCO change, due to GuessOS update Revision ChangesPath 1.47 +1 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.46 retrieving revision 1.47 diff -C3 -r1.46 -r1.47 *** Configure 1996/12/08 22:53:43 1.46 --- Configure 1996/12/08 23:54:49 1.47 *** *** 251,257 CFLAGS=$CFLAGS -DSCO -Oacgiltz LIBS=$LIBS -lPW -lsocket -lmalloc -lcrypt_i ;; ! *-sco5*|*-SCO_SV*) OS='SCO 5' CFLAGS=$CFLAGS -DSCO5 LIBS=$LIBS -lsocket -lmalloc -lprot --- 251,257 CFLAGS=$CFLAGS -DSCO -Oacgiltz LIBS=$LIBS -lPW -lsocket -lmalloc -lcrypt_i ;; ! *-sco5*) OS='SCO 5' CFLAGS=$CFLAGS -DSCO5 LIBS=$LIBS -lsocket -lmalloc -lprot
cvs commit: apache/src Configure
brian 96/12/08 22:39:50 Modified:src Configure Log: Submitted by: [EMAIL PROTECTED] Added CFLAGS for HPUX10 compiler. Bria Revision ChangesPath 1.51 +4 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.50 retrieving revision 1.51 diff -C3 -r1.50 -r1.51 *** Configure 1996/12/09 05:57:02 1.50 --- Configure 1996/12/09 06:39:49 1.51 *** *** 167,172 --- 167,176 *-hp-hpux10.*) OS='HP-UX 10' CFLAGS=$CFLAGS -DHPUX10 + # if we're using the HPUX compiler, add a few flags. + if [ $CC = cc ]; then + CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE + fi ;; *-hp-hpux*) OS='HP-UX'
cvs commit: apache/src Configure
ben 96/12/05 02:48:30 Modified:src Configure Log: Make Irix 64 compile Apache 32-bit for now. Revision ChangesPath 1.42 +5 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.41 retrieving revision 1.42 diff -C3 -r1.41 -r1.42 *** Configure 1996/12/03 17:35:27 1.41 --- Configure 1996/12/05 10:48:29 1.42 *** *** 171,177 OS='HP-UX' CFLAGS=$CFLAGS -DHPUX ;; ! *-sgi-irix*) DEF_WANTHSREGEX=yes DBM_LIB= if [ $RULE_IRIXNIS = yes ]; then --- 171,181 OS='HP-UX' CFLAGS=$CFLAGS -DHPUX ;; ! *-sgi-irix64) ! # Note: We'd like to see patches to compile 64-bit, but for now... ! CFLAGS=$CFLAGS -n32 ! LFLAGS=$LFLAGS -n32 ! *-sgi-irix) DEF_WANTHSREGEX=yes DBM_LIB= if [ $RULE_IRIXNIS = yes ]; then
cvs commit: apache/src Configure
ben 96/12/05 03:06:07 Modified:src Configure Log: Ahem. Correct Irix 64 patch. Revision ChangesPath 1.43 +11 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.42 retrieving revision 1.43 diff -C3 -r1.42 -r1.43 *** Configure 1996/12/05 10:48:29 1.42 --- Configure 1996/12/05 11:06:06 1.43 *** *** 175,180 --- 175,191 # Note: We'd like to see patches to compile 64-bit, but for now... CFLAGS=$CFLAGS -n32 LFLAGS=$LFLAGS -n32 + DEF_WANTHSREGEX=yes + DBM_LIB= + if [ $RULE_IRIXNIS = yes ]; then + OS='SGI IRIX w/NIS' + CFLAGS=$CFLAGS -DIRIX + LIBS=$LIBS -lsun + else + OS='SGI IRIX' + CFLAGS=$CFLAGS -DIRIX + fi + ;; *-sgi-irix) DEF_WANTHSREGEX=yes DBM_LIB=
cvs commit: apache/src Configure
ben 96/12/05 03:16:10 Modified:src Configure Log: Point at the PORTING file, encourage someone to port to 64 bit Irix. Revision ChangesPath 1.44 +5 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.43 retrieving revision 1.44 diff -C3 -r1.43 -r1.44 *** Configure 1996/12/05 11:06:06 1.43 --- Configure 1996/12/05 11:16:09 1.44 *** *** 173,178 --- 173,180 ;; *-sgi-irix64) # Note: We'd like to see patches to compile 64-bit, but for now... + echo You are running 64-bit Irix. For now, we will compile 32-bit + echo but if you would care to port to 64-bit, send us the patches. CFLAGS=$CFLAGS -n32 LFLAGS=$LFLAGS -n32 DEF_WANTHSREGEX=yes *** *** 300,306 uname -v echo uname -X uname -X ! echo Please Email this output to [EMAIL PROTECTED] echo Thank you exit 1 ;; --- 302,310 uname -v echo uname -X uname -X ! echo Ideally, read the file PORTING, do what it says and send the ! echo resulting patches to [EMAIL PROTECTED] Otherwise, email ! echo this output to [EMAIL PROTECTED] echo Thank you exit 1 ;;
cvs commit: apache/src Configure
brian 96/11/19 21:12:59 Modified:src Configure Log: Revision ChangesPath 1.36 +2 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.35 retrieving revision 1.36 diff -C3 -r1.35 -r1.36 *** Configure 1996/11/12 05:22:02 1.35 --- Configure 1996/11/20 05:12:57 1.36 *** *** 1,5 #!/bin/sh ! # $Id: Configure,v 1.35 1996/11/12 05:22:02 fielding Exp $ trap 'rm -f $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. --- 1,5 #!/bin/sh ! # $Id: Configure,v 1.36 1996/11/20 05:12:57 brian Exp $ trap 'rm -f $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. *** *** 241,246 --- 241,247 CFLAGS=$CFLAGS -DSOLARIS2 LIBS=$LIBS -lsocket -lnsl DBM_LIB= + DEF_WANTHSREGEX=yes ;; *-sunos4*) OS='SunOS 4'
Re: cvs commit: apache/src Configure
Ack, my mistake - I meant to add the Submitted and Reviewed lines and the log as appropriate but that didn't happen. Can this be added after the fact? Brian On Tue, 19 Nov 1996, Brian Behlendorf wrote: brian 96/11/19 21:12:59 Modified:src Configure Log: Revision ChangesPath 1.36 +2 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.35 retrieving revision 1.36 diff -C3 -r1.35 -r1.36 *** Configure 1996/11/12 05:22:02 1.35 --- Configure 1996/11/20 05:12:57 1.36 *** *** 1,5 #!/bin/sh ! # $Id: Configure,v 1.35 1996/11/12 05:22:02 fielding Exp $ trap 'rm -f $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. --- 1,5 #!/bin/sh ! # $Id: Configure,v 1.36 1996/11/20 05:12:57 brian Exp $ trap 'rm -f $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. *** *** 241,246 --- 241,247 CFLAGS=$CFLAGS -DSOLARIS2 LIBS=$LIBS -lsocket -lnsl DBM_LIB= + DEF_WANTHSREGEX=yes ;; *-sunos4*) OS='SunOS 4' --=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-- [EMAIL PROTECTED] www.apache.org hyperreal.com http://www.organic.com/JOBS
cvs commit: apache/src Configure
fielding96/11/19 22:04:31 Modified:src Configure Log: Removed another pesky Id line Revision ChangesPath 1.37 +0 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.36 retrieving revision 1.37 diff -C3 -r1.36 -r1.37 *** Configure 1996/11/20 05:12:57 1.36 --- Configure 1996/11/20 06:04:29 1.37 *** *** 1,5 #!/bin/sh - # $Id: Configure,v 1.36 1996/11/20 05:12:57 brian Exp $ trap 'rm -f $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. --- 1,4
Re: cvs commit: apache/src Configure
Ack, my mistake - I meant to add the Submitted and Reviewed lines and the log as appropriate but that didn't happen. Can this be added after the fact? Not without making a mess -- don't worry about it. .Roy
cvs commit: apache/src Configure http_config.h http_config.c http_core.c http_main.c mod_info.c
fielding96/11/11 21:22:10
Modified:src Configure http_config.h http_config.c http_core.c
http_main.c mod_info.c
Log:
Removed the module_names[] and preloaded_module_names[] arrays.
All functions now get the name from the module structure and either
search the preloaded_modules list (for static info) or the actual
linked list of modules (for active modules).
Docs note: The httpd -h and httpd -l options print info about all
compiled modules, not just the active (prelinked) ones. mod_info only
prints the prelinked module information [I would have changed that, but
the code in mod_info uses an, u, unusual style]. The IfModule
and AddModule directives' use the file name of the module (what you now see
with httpd -l) as the argument.
Revision ChangesPath
1.35 +1 -13 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.34
retrieving revision 1.35
diff -C3 -r1.34 -r1.35
*** Configure 1996/11/04 00:55:16 1.34
--- Configure 1996/11/12 05:22:02 1.35
***
*** 1,5
#!/bin/sh
! # $Id: Configure,v 1.34 1996/11/04 00:55:16 brian Exp $
trap 'rm -f $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
--- 1,5
#!/bin/sh
! # $Id: Configure,v 1.35 1996/11/12 05:22:02 fielding Exp $
trap 'rm -f $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
***
*** 74,96
} \
print NULL; \
print };; \
- print char *module_names[] = {; \
- for (i = 0; i n; ++i) { \
- printf \%s\,\n, modules[i]; \
- } \
- print NULL; \
- print };; \
print module *preloaded_modules[] = {; \
for (i = 0; i pn; ++i) { \
printf %s_module,\n, pmodules[i]; \
} \
print NULL; \
- print };; \
- print char *preloaded_module_names[] = {; \
- for (i = 0; i pn; ++i) { \
- printf \%s\,\n, pmodules[i]; \
- } \
- print NULL; \
print };; \
}'
--- 74,84
1.21 +4 -2 apache/src/http_config.h
Index: http_config.h
===
RCS file: /export/home/cvs/apache/src/http_config.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C3 -r1.20 -r1.21
*** http_config.h 1996/11/04 00:55:17 1.20
--- http_config.h 1996/11/12 05:22:03 1.21
***
*** 249,257
/* Finally, the hook for dynamically loading modules in... */
void add_module (module *m);
! int add_named_module (char *name);
void clear_module_list ();
! char *find_module_name (module *m);
#ifdef CORE_PRIVATE
--- 249,258
/* Finally, the hook for dynamically loading modules in... */
void add_module (module *m);
! int add_named_module (const char *name);
void clear_module_list ();
! const char *find_module_name (module *m);
! module *find_linked_module (const char *name);
#ifdef CORE_PRIVATE
***
*** 260,265
--- 261,267
server_rec *read_config (pool *conf_pool, pool *temp_pool, char
*config_name);
void setup_prelinked_modules();
void show_directives();
+ void show_modules();
/* For http_request.c... */
1.33 +36 -23apache/src/http_config.c
Index: http_config.c
===
RCS file: /export/home/cvs/apache/src/http_config.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C3 -r1.32 -r1.33
*** http_config.c 1996/11/04 18:09:55 1.32
--- http_config.c 1996/11/12 05:22:04 1.33
***
*** 399,425
}
}
! char *find_module_name (module *m)
{
! extern char *preloaded_module_names[];
! if (m-module_index = 0 m-module_index total_modules)
! return preloaded_module_names[m-module_index];
return NULL;
}
/* Add a named module. Returns 1 if module found, 0 otherwise. */
! int add_named_module (char *name)
{
extern module *preloaded_modules[];
! extern char *preloaded_module_names[];
! int i;
! for (i = 0; preloaded_module_names[i]; ++i) {
! if (strcmp (preloaded_module_names[i], name) == 0) {
/* Only add modules that are not already enabled. */
! if (preloaded_modules[i]-next == NULL) {
! add_module (preloaded_modules[i]);
}
return 1;
}
--- 399,432
}
}
! const char *find_module_name
cvs commit: apache/src Configure
mjc 96/09/24 07:33:59 Modified:src Configure Log: No DBM libs needed for Solaris or Irix Revision ChangesPath 1.21 +3 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.20 retrieving revision 1.21 diff -C3 -r1.20 -r1.21 *** Configure 1996/09/23 10:14:59 1.20 --- Configure 1996/09/24 14:33:57 1.21 *** *** 1,5 #!/bin/sh ! # $Id: Configure,v 1.20 1996/09/23 10:14:59 ben Exp $ trap 'rm $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. --- 1,5 #!/bin/sh ! # $Id: Configure,v 1.21 1996/09/24 14:33:57 mjc Exp $ trap 'rm $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. *** *** 173,178 --- 173,179 *-sgi-irix*) DEF_WANTHSREGEX=yes DEF_BADMMAP=no + DBM_LIB= if [ $RULE_IRIXNIS = yes ]; then OS='SGI IRIX w/NIS' CFLAGS=$CFLAGS -DIRIX *** *** 236,241 --- 237,243 OS='Solaris 2' CFLAGS=$CFLAGS -DSOLARIS2 LIBS=$LIBS -lsocket -lnsl + DBM_LIB= ;; *-sunos4*) OS='SunOS 4'
cvs commit: apache/src Configure CutRule Makefile.tmpl
jim 96/09/08 09:14:57
Modified:src Configure CutRule Makefile.tmpl
Log:
Log: Minor Configure fluff
Description: Map RULES to lowercase and work with OLD
shell tests
Revision ChangesPath
1.15 +9 -9 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.14
retrieving revision 1.15
diff -C3 -r1.14 -r1.15
*** Configure 1996/09/08 13:52:39 1.14
--- Configure 1996/09/08 16:14:55 1.15
***
*** 1,5
#!/bin/sh
! # $Id: Configure,v 1.14 1996/09/08 13:52:39 ben Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
--- 1,5
#!/bin/sh
! # $Id: Configure,v 1.15 1996/09/08 16:14:55 jim Exp $
trap 'rm $tmpfile; exit' 0 1 2 3 15
# Apache configuration script, first cut --- rst.
***
*** 114,120
PLAT=`grep PLATFORM= Makefile | awk '{ print $1 }' | awk -F= '{ print $2
}'`
! if [ $PLAT = ]; then
echo PLATFORM has not been set!
exit 1
fi
--- 114,120
PLAT=`grep PLATFORM= Makefile | awk '{ print $1 }' | awk -F= '{ print $2
}'`
! if [ x$PLAT = x ]; then
echo PLATFORM has not been set!
exit 1
fi
***
*** 206,212
OS='SCO 5'
CFLAGS=$CFLAGS -DSCO5
LIBS=$LIBS -lsocket -lmalloc -lprot
! OSBPRINTF= -K noinline
DEF_HSREGEX=no
DEF_BADMMAP=no
;;
--- 206,212
OS='SCO 5'
CFLAGS=$CFLAGS -DSCO5
LIBS=$LIBS -lsocket -lmalloc -lprot
! OSBPRINTF=-K noinline
DEF_HSREGEX=no
DEF_BADMMAP=no
;;
***
*** 245,257
# Extract the rules
! RULE_HSREGEX=`CutRule HSREGEX`
! RULE_STATUS=`CutRule STATUS`
! RULE_SOCKS=`CutRule SOCKS`
! RULE_BADMMAP=`CutRule BADMMAP`
if [ $RULE_HSREGEX = default ]; then
! if [ $DEF_HSREGEX = ]; then
RULE_HSREGEX=no
else
RULE_HSREGEX=$DEF_HSREGEX
--- 245,257
# Extract the rules
! RULE_HSREGEX=`./CutRule HSREGEX`
! RULE_STATUS=`./CutRule STATUS`
! RULE_SOCKS=`./CutRule SOCKS`
! RULE_BADMMAP=`./CutRule BADMMAP`
if [ $RULE_HSREGEX = default ]; then
! if [ x$DEF_HSREGEX = x ]; then
RULE_HSREGEX=no
else
RULE_HSREGEX=$DEF_HSREGEX
***
*** 259,265
fi
if [ $RULE_BADMMAP = default ]; then
! if [ $DEF_BADMMAP = ]; then
RULE_BADMMAP=no
else
RULE_BADMMAP=$DEF_BADMMAP
--- 259,265
fi
if [ $RULE_BADMMAP = default ]; then
! if [ x$DEF_BADMMAP = x ]; then
RULE_BADMMAP=no
else
RULE_BADMMAP=$DEF_BADMMAP
1.2 +3 -1 apache/src/CutRule
Index: CutRule
===
RCS file: /export/home/cvs/apache/src/CutRule,v
retrieving revision 1.1
retrieving revision 1.2
diff -C3 -r1.1 -r1.2
*** CutRule 1996/09/08 13:52:40 1.1
--- CutRule 1996/09/08 16:14:55 1.2
***
*** 1,4
# Helper script for Configure - cut a rule from Configuration.
# note that there is a tab and a space in the character groups.
! egrep Rule[ ]+$1[ ]*= Configuration|cut -d= -f2|sed 's/[
]//g'
--- 1,6
# Helper script for Configure - cut a rule from Configuration.
# note that there is a tab and a space in the character groups.
+ # Map to lowercase to make tests easier
! egrep Rule[ ]+$1[ ]*= Configuration|cut -d= -f2|sed 's/[
]//g'\
! | tr A-Z a-z
1.25 +2 -2 apache/src/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
retrieving revision 1.24
retrieving revision 1.25
diff -C3 -r1.24 -r1.25
*** Makefile.tmpl 1996/09/08 12:19:09 1.24
--- Makefile.tmpl 1996/09/08 16:14:55 1.25
***
*** 1,4
! # $Id: Makefile.tmpl,v 1.24 1996/09/08 12:19:09 ben Exp $
# Apache makefile template (well, suffix).
# This is combined with the information in the Configuration file
--- 1,4
! # $Id: Makefile.tmpl,v 1.25 1996/09/08 16:14:55 jim Exp $
# Apache makefile template (well, suffix).
# This is combined with the information in the Configuration file
***
*** 14,20
md5c.o util_md5.o explain.o http_bprintf.o $(MODULES)
.c.o:
! $(CC) -c $(INCLUDES) $(CFLAGS) $
all: Configuration httpd
--- 14,20
md5c.o util_md5.o explain.o http_bprintf.o $(MODULES)
.c.o:
! $(CC)
cvs commit: apache/src Configure
ben 96/08/17 07:18:22 Modified:src Configure Log: Add -lcrypt to BSD486. Revision ChangesPath 1.10 +1 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.9 retrieving revision 1.10 diff -C3 -r1.9 -r1.10 *** Configure 1996/08/06 18:28:40 1.9 --- Configure 1996/08/17 14:18:20 1.10 *** *** 173,178 --- 173,179 ;; BSD486) OS='FreeBSD/NETBSD on 486' + LIBS=$LIBS -lcrypt ;; NeXT) OS='NeXT'
cvs commit: apache/src Configure
chuck 96/08/17 10:27:34 Modified:src Configure Log: Submitted by: Chuck Murcko Add missing /; escape - as a grep arg (-lsocks) Revision ChangesPath 1.11 +1 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.10 retrieving revision 1.11 diff -C3 -r1.10 -r1.11 *** Configure 1996/08/17 14:18:20 1.10 --- Configure 1996/08/17 17:27:32 1.11 *** *** 290,296 # Set flag and check Makefile for -lsocks line CFLAGS=$CFLAGS -Dconnect=Rconnect -Dselect=Rselect CFLAGS=$CFLAGS -Dgethostbyname=Rgethostbyname ! if grep EXTRA_ Makefile | grep -lsocks /dev null; then : else LIBS=$LIBS -L/usr/local/lib -lsocks --- 290,296 # Set flag and check Makefile for -lsocks line CFLAGS=$CFLAGS -Dconnect=Rconnect -Dselect=Rselect CFLAGS=$CFLAGS -Dgethostbyname=Rgethostbyname ! if grep EXTRA_ Makefile | grep \-lsocks /dev/null; then : else LIBS=$LIBS -L/usr/local/lib -lsocks
cvs commit: apache/src Configure
jim 96/03/16 14:50:16 Modified:src Configure Log: stupid typo Revision ChangesPath 1.4 +1 -1 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** Configure 1996/03/16 22:44:48 1.3 --- Configure 1996/03/16 22:50:14 1.4 *** *** 10,16 echo Using alternate config file $2 file=$2 else ! echo Using \'$file\' as config file fi # First, strip comments and blank lines... --- 10,16 echo Using alternate config file $2 file=$2 else ! echo Using '$file' as config file fi # First, strip comments and blank lines...
