cvs commit: apache-1.3/src Configure
pcs 98/02/03 02:49:27 Modified:src Configure Log: Add support for building shared modules. A new Configuration command, SharedModule, indicates that a module should be built as a shared library. For example: SharedModule modules/standard/mod_status.so (note the change of extension). Building Apache will then build modules/standard/mod_status.so. This should be copied into somewhere under the server root and loaded with a directive like: LoadModule status_module modules/mod_status.so The compiler and linker flags for creating shareable and shared modules will need adding for the supported OSes. I've put some default ones in for FreeBSD and Linux. This can also be set in the Configuration file (if set here, it will override the defaults contained within the Configure script). If there are no SharedModule lines none of these extra options will be used anywhere in the build process. If the final link of httpd requires any extra libraries (typically -ldl) this will have to be given on EXTRA_LIBS in Configuration. The Configure variables and Configuration options are CFLAGS_SHLIB Options when building .o files ready for sharing (e.g. -fpic) LDFLAGS_SHLIBOptions when linking .o files to .so (e.g. -Bshareable, -export, -assert pure-text) LDFLAGS_SHLIB_EXPORT Options required when linking httpd so that it exports its symbols for linking at runtime (e.g. -Bdynamic, -rdynamic, -export-dynamic) The options used in Configure could be placed in Configuration like this: CFLAGS_SHLIB=-fpic LDFLAGS_SHLIB=-Bshareable LDFLAGS_SHLIB_EXPORT=-rdynamic Revision ChangesPath 1.181 +62 -4 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- Configure 1998/02/01 16:33:10 1.180 +++ Configure 1998/02/03 10:49:27 1.181 @@ -71,9 +71,12 @@ sed 's/^Rule[ ]*/##Rule:/' | \ sed 's/^[ ]*AddModule/AddModule/' | \ sed 's/^[]*%AddModule/%AddModule/' | \ + sed 's/^[]*SharedModule/SharedModule/' | \ sed 's/^[ ]*Module/Module/' | \ sed 's/^[]*%Module/%Module/' > $tmpfile +using_shlib=`grep '^SharedModule' $tmpfile >/dev/null && echo 1` + # # Only "assignment" ("=") statements and Module lines # should be left at this point. If there is other stuff @@ -81,6 +84,7 @@ # if egrep -v '^%?Module[ ]+[A-Za-z0-9_]+[]+[^]+$' $tmpfile \ | egrep -v '^%?AddModule[ ]+[^]+$' \ + | egrep -v '^SharedModule[ ]+[^]+$' \ | grep -v = > /dev/null then echo "Syntax error --- The configuration file is used only to" @@ -88,6 +92,7 @@ echo "options or Configure rules, and I don't see that at all:" egrep -v '^%?Module[ ]+[A-Za-z0-9_]+[]+[^]+$' $tmpfile \ | egrep -v '^%?AddModule[ ]+[^]+$' \ + | egrep -v '^%?SharedModule[ ]+[^]+$' \ | grep -v = exitcode=1 exit 1 @@ -316,11 +321,15 @@ OS='Linux' CFLAGS="$CFLAGS -DLINUX=2" LIBS="$LIBS -lm" + CFLAGS_SHLIB="-fpic" + LDFLAGS_SHLIB="-Bshareable" ;; *-linux1) DEF_WANTHSREGEX=yes OS='Linux' CFLAGS="$CFLAGS -DLINUX=1" + CFLAGS_SHLIB="-fpic" + LDFLAGS_SHLIB="-Bshareable" ;; *-lynx-lynxos) OS='LynxOS 2.x' @@ -352,6 +361,8 @@ LIBS="$LIBS -lcrypt" DBM_LIB="" DB_LIB="" + CFLAGS_SHLIB="-fpic" + LDFLAGS_SHLIB="-Bshareable" ;; *-openbsd*) OS='OpenBSD' @@ -636,6 +647,8 @@ # Look for OPTIM and save for later # TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'` +TLDFLAGS_SHLIB=`egrep '^LDFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F= '{print $2}'` +TCFLAGS_SHLIB=`egrep '^CFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F= '{print $2}'` # Set the value of CC if need be @@ -644,6 +657,26 @@ echo "CC=$CC" >> Makefile.config fi +if [ "x$using_shlib" = "x1" ] ; then +# +# Set the value of the shared libary flags, if they aren't explicitly +# set in the configuration file +# +if [ "x$TCFLAGS_SHLIB" = "x" ]; then +echo "CFLAGS_SHLIB=$CFLAGS_SHLIB" >> Makefile.config +fi +if [ "x$TLDFLAGS_SHLIB" = "x" ]; then +echo "LDFLAGS_SHLIB=$LDFLAGS_SHLIB" >> Makefile.config +fi +if [ "x$TLDFLAGS_SHLIB_EXPORT" = "x" ]; then +if [ "x$TCC" = "xgcc" ] || + [ "x$TCC" = "x" -a "x$CC" = "xgcc" ] ; then + LDF
cvs commit: apache-1.3/src Configure
pcs 98/02/04 02:27:44 Modified:src Configure Log: Add -DSHARED_MODULE when compiling modules to be shared (at least, when Configure auto-creates a Makefile to build the module). Submitted by: Alexei Revision ChangesPath 1.182 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- Configure 1998/02/03 10:49:27 1.181 +++ Configure 1998/02/04 10:27:42 1.182 @@ -663,7 +663,7 @@ # set in the configuration file # if [ "x$TCFLAGS_SHLIB" = "x" ]; then -echo "CFLAGS_SHLIB=$CFLAGS_SHLIB" >> Makefile.config +echo "CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE" >> Makefile.config fi if [ "x$TLDFLAGS_SHLIB" = "x" ]; then echo "LDFLAGS_SHLIB=$LDFLAGS_SHLIB" >> Makefile.config
cvs commit: apache-1.3/src Configure
jim 98/02/21 09:22:57 Modified:src Configure Log: Oops... wrong quotes :) Revision ChangesPath 1.188 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.187 retrieving revision 1.188 diff -u -r1.187 -r1.188 --- Configure 1998/02/21 17:19:47 1.187 +++ Configure 1998/02/21 17:22:56 1.188 @@ -359,7 +359,7 @@ ;; *-freebsd*) PLATOSVERS=`echo $PLAT | sed 's/^.*freebsd//'` - OS='FreeBSD $PLATOSVERS' + OS="FreeBSD $PLATOSVERS" case "$PLATOSVERS" in [23]*) DEF_WANTHSREGEX=no
cvs commit: apache-1.3/src Configure
martin 98/02/27 06:45:01 Modified:src Configure Log: SVR4 (at least SINIX) needs -DHAS_DLFCN Revision ChangesPath 1.189 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.188 retrieving revision 1.189 diff -u -u -r1.188 -r1.189 --- Configure 1998/02/21 17:22:56 1.188 +++ Configure 1998/02/27 14:45:00 1.189 @@ -483,7 +483,7 @@ ;; *-sni-sysv4*) OS='SVR4' - CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN" + CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN" DEF_WANTHSREGEX=yes LIBS="$LIBS -lsocket -lnsl -lc" ;;
cvs commit: apache-1.3/src Configure
pcs 98/02/28 03:50:53 Modified:src Configure Log: Module Makefiles generated by Configure do not remove shared library files (.so). Also they remove "*.o" which could delete object files not part of Apache. Ensure that make clean in module directories only removes Apache-built object and shared-libraries. Revision ChangesPath 1.190 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.189 retrieving revision 1.190 diff -u -r1.189 -r1.190 --- Configure 1998/02/27 14:45:00 1.189 +++ Configure 1998/02/28 11:50:53 1.190 @@ -1170,7 +1170,7 @@ $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< clean: - rm -f *.o $(LIB) $(SHLIB) + rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB) $(OBJS) $(SHLIBS) $(SHLIBS_OBJ): Makefile EOF
cvs commit: apache-1.3/src Configure
rse 98/03/08 04:58:21 Modified:src Configure Log: Fix Configure script: 1. move generation of ap_config.h to a later point in the script because else it doesn't pick up HIDE or STATUS correctly. 2. change the generation of shared objects from explicit rules to implicit rules: First the $< is only portable for implict rules (e.g. FreeBSD's make fails) and second we already build .o's implicitly, so we should do with .so's the same way. Revision ChangesPath 1.195 +26 -23apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- Configure 1998/03/05 18:58:31 1.194 +++ Configure 1998/03/08 12:58:19 1.195 @@ -841,24 +841,6 @@ }'` # -# At this point we can pick out all -D's from CFLAGS and create ap_config.h -# to be used by external modules needing to include Apache header files. -# - -for cflag in $CFLAGS; do - echo $cflag >>$tmpconfig ; -done -awk > include/ap_config.h < $tmpconfig ' - BEGIN { - printf "/* Automatically generated file - do not edit */\n\n" - } - /^-D.*/ { - split(substr($1,3,length($1)),parts,"=") - printf ("#define %s %s\n",parts[1],parts[2]) - } -' - -# # Now autoconfigure each of the modules specified by AddModule. # Use tmpfile2 for the module definition file, and tmpfile3 for the # shell commands to be executed for this module. @@ -1078,6 +1060,25 @@ echo " End of Configure created section ">> Makefile.config +# Continue building include/ap_config.h +# +# We pick out all -D's from CFLAGS and create ap_config.h which +# can be used by external modules needing to include Apache +# header files. +for cflag in $CFLAGS; do + echo $cflag >>$tmpconfig ; +done +awk > include/ap_config.h < $tmpconfig ' + BEGIN { + printf "/* Automatically generated file - do not edit */\n\n" + } + /^-D.*/ { + split(substr($1,3,length($1)),parts,"=") + printf ("#define %s %s\n",parts[1],parts[2]) + } +' + + # Use TestCompile to see if $(CC) is ANSI and as a "final" sanity # check # @@ -1167,15 +1168,11 @@ split(pp[3], parts, ".") base=parts[1] shlibsobj=shlibsobj " " base "-so.o" - comp=comp base ".so: " base "-so.o\n" - comp=comp " $(LD) $(LDFLAGS) $(LDFLAGS_SHLIB) -o " base ".so $<\n" - comp=comp base "-so.o: " base ".c\n" - comp=comp " $(CC) $(CFLAGS) $(INCLUDES) $(CFLAGS_SHLIB) -c -o " base "-so.o $<\n" } END { printf "SHLIBS=%s\n", shlibs; printf "SHLIBS_OBJ=%s\n", shlibsobj; - print "\n" comp "\n" }' +}' $CAT << 'EOF' >> $moddir/Makefile @@ -1188,8 +1185,14 @@ ar cr $@ $(OBJS) $(RANLIB) $@ +.SUFFIXES: .o .so + .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< + +.c.so: + $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) -o $*-so.o $< + $(LD) $(LDFLAGS) $(LDFLAGS_SHLIB) -o $@ $*-so.o clean: rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB)
cvs commit: apache-1.3/src Configure
pcs 98/03/09 00:41:59 Modified:src Configure Log: This patch lets modules append themselves to SERVER_SUBVERSION at configure time without interfering with other modules doing the same. It is used like this in .module files or CONFIG_START/END sections: SUBVERSION="$SUBVERSION mymodule/123" At present multiple modules adding themselves to the version string get confused, causing compile warnings and ending up with only one module in the version. Module authors using -DSERVER_SUBVERSION in their $CFLAGS will have to make a slight modification to the above format instead. This will only affect modules designed for 1.3 betas. Reviewed by: Dean Gaudet, Ralf S. Engelschall, Ken Coar Revision ChangesPath 1.196 +8 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.195 retrieving revision 1.196 diff -u -r1.195 -r1.196 --- Configure 1998/03/08 12:58:19 1.195 +++ Configure 1998/03/09 08:41:58 1.196 @@ -1029,6 +1029,14 @@ EOF4 awk -f $awkfile >>Makefile
cvs commit: apache-1.3/src Configure
rse 98/03/09 04:52:06 Modified:src Configure Log: ConfigStart/End sections were totally ignored for SharedModule Revision ChangesPath 1.197 +9 -5 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- Configure 1998/03/09 08:41:58 1.196 +++ Configure 1998/03/09 12:52:05 1.197 @@ -815,7 +815,7 @@ # additional hackery. It would be nice to reduce the number of times # we have to awk the $tmpfile, though. -# MODFILES contains a list of module filenames (could be .c, .o, .a +# MODFILES contains a list of module filenames (could be .c, .o, .so, .a #or .module files) from AddModule lines only # MODDIRS contains a list of subdirectories under 'modules' which #contain modules we want to build from both AddModule and Module @@ -823,7 +823,7 @@ echo " + adding selected modules" -MODFILES=`awk <$tmpfile '$1 == "AddModule" { printf "%s ", $2 }'` +MODFILES=`awk <$tmpfile '($1 == "AddModule" || $1 == "SharedModule") { printf "%s ", $2 }'` MODDIRS=`awk < $tmpfile ' ($1 == "Module" && $3 ~ /^modules\//) { split ($3, pp, "/") @@ -892,14 +892,18 @@ . ./$tmpfile3 fi rm -f $tmpfile2 $tmpfile3 - ext=o + if [ $ext != so ]; then + ext=o + fi fi if [ "x$modname" = "x" ] ; then modname=`echo $modbase | sed 's/^.*\///' | \ sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'` fi -#echo "Adding Module $modname $modbase.$ext" - echo "Module $modname $modbase.$ext" >>$tmpfile + if [ $ext != so ]; then +#echo "Adding Module $modname $modbase.$ext" + echo "Module $modname $modbase.$ext" >>$tmpfile + fi done # $tmpfile now contains Module lines for all the modules we want
cvs commit: apache-1.3/src Configure
rasmus 98/03/09 11:02:31 Modified:src Configure Log: The generated CFLAGS line needs to end up looking like: -DSERVER_SUBVERSION=\"WHATEVER\" Need to add a bunch of escapes here to achieve that. Revision ChangesPath 1.199 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.198 retrieving revision 1.199 diff -u -r1.198 -r1.199 --- Configure 1998/03/09 16:47:08 1.198 +++ Configure 1998/03/09 19:02:29 1.199 @@ -1081,7 +1081,7 @@ # if [ "x$SUBVERSION" != "x" ] ; then SUBVERSION=`echo $SUBVERSION | sed 's/^ +//'` - CFLAGS="$CFLAGS -DSERVER_SUBVERSION=\"$SUBVERSION\"" + CFLAGS="$CFLAGS -DSERVER_SUBVERSION=\\\"$SUBVERSION\\\"" fi
cvs commit: apache-1.3/src Configure
dgaudet 98/03/10 01:52:19 Modified:src Configure Log: It is bogus to use LDFLAGS on the shared ld command line for at least two reasons: - LDFLAGS has traditionally meant "flags to use when linking an executable", and such flags can be different than those for making a shared library - LDFLAGS has traditionally been flags supplied to the cc executable for linking, not flags supplied to the ld executable... cc translates various flags before passing them to ld. For example, "gcc -Wl,M" passes -M to ld. Revision ChangesPath 1.200 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.199 retrieving revision 1.200 diff -u -r1.199 -r1.200 --- Configure 1998/03/09 19:02:29 1.199 +++ Configure 1998/03/10 09:52:18 1.200 @@ -1247,7 +1247,7 @@ .c.so: $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) -o $*-so.o $< - $(LD) $(LDFLAGS) $(LDFLAGS_SHLIB) -o $@ $*-so.o + $(LD) $(LDFLAGS_SHLIB) -o $@ $*-so.o clean: rm -f $(OBJS) $(SHLIBS) $(SHLIBS_OBJ) $(LIB) $(SHLIB)
cvs commit: apache-1.3/src Configure
jim 98/03/11 13:06:06 Modified:src Configure Log: Submitted by: Jim Jagielski If Configuration.tmpl is more recent that Configuration, Configure will now complain. Revision ChangesPath 1.203 +17 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- Configure 1998/03/11 09:57:25 1.202 +++ Configure 1998/03/11 21:06:05 1.203 @@ -46,7 +46,6 @@ shift 1 fi done -echo "Using config file: $file" if [ ! -r $file ]; then echo "Can't see or read \"$file\"" @@ -55,6 +54,23 @@ exitcode=1 exit 1 fi + +# +# Now see if Configuration.tmpl is more recent than $file. If +# so, then we complain and bail out +# + +if ls -lt Configuration.tmpl $file | head -1 | \ + grep 'Configuration.tmpl' > /dev/null +then + echo "Configuration.tmpl is more recent than $file;" + echo "Make sure that $file is valid and, if it is, simply" + echo "'touch $file' and re-run $0 again." + exitcode=1 + exit 1 +fi + +echo "Using config file: $file" ## From the Configuration file, create a "cleaned-up" version
cvs commit: apache-1.3/src Configure
rasmus 98/03/11 15:58:04 Modified:src Configure Log: When writing the SERVER_SUBVERSION -D flag to ap_config.h it came out looking like: #define SERVER_SUBVERSION \"whatever\" When including this in a file you end up with an unterminated string constant. We want it to look like this instead: #define SERVER_SUBVERSION "whatever" The backslashes are only needed in the actual -D argument. This little patch makes sure that any \" from a -D is replaced with just " when ap_config.h is generated. Revision ChangesPath 1.204 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.203 retrieving revision 1.204 diff -u -r1.203 -r1.204 --- Configure 1998/03/11 21:06:05 1.203 +++ Configure 1998/03/11 23:58:03 1.204 @@ -1165,7 +1165,7 @@ # can be used by external modules needing to include Apache # header files. for cflag in $CFLAGS; do - echo $cflag >>$tmpconfig ; + echo $cflag | sed 's/\\\"/\"/g' >>$tmpconfig ; done awk > include/ap_config.h < $tmpconfig ' BEGIN {
cvs commit: apache-1.3/src Configure
jim 98/03/13 16:08:57 Modified:src Configure Log: Wrap the saved "CFLAGS -D" entries to allow external modules to overrule values and cut down on redef. warnings Revision ChangesPath 1.208 +2 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.207 retrieving revision 1.208 diff -u -r1.207 -r1.208 --- Configure 1998/03/13 23:44:41 1.207 +++ Configure 1998/03/14 00:08:56 1.208 @@ -1201,7 +1201,8 @@ } /^-D.*/ { split(substr($1,3,length($1)),parts,"=") - printf ("#define %s %s\n",parts[1],parts[2]) + printf ("#ifndef %s\n#define %s %s\n#endif\n", + parts[1],parts[1],parts[2]) } '
cvs commit: apache-1.3/src Configure
marc98/03/15 09:03:54 Modified:src Configure Log: Some awks (eg. SunOS4) don't like this line continuation, so remove it. Revision ChangesPath 1.209 +1 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.208 retrieving revision 1.209 diff -u -r1.208 -r1.209 --- Configure 1998/03/14 00:08:56 1.208 +++ Configure 1998/03/15 17:03:53 1.209 @@ -1201,8 +1201,7 @@ } /^-D.*/ { split(substr($1,3,length($1)),parts,"=") - printf ("#ifndef %s\n#define %s %s\n#endif\n", - parts[1],parts[1],parts[2]) + printf ("#ifndef %s\n#define %s %s\n#endif\n", parts[1],parts[1],parts[2]) } '
cvs commit: apache-1.3/src Configure
rse 98/03/16 10:36:18 Modified:src Configure Log: Shared object support for UnixWare 2.1.x (still not tested but according to the manpages of 2.1.2 this should be correct) Revision ChangesPath 1.210 +8 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.209 retrieving revision 1.210 diff -u -r1.209 -r1.210 --- Configure 1998/03/15 17:03:53 1.209 +++ Configure 1998/03/16 18:36:17 1.210 @@ -741,6 +741,14 @@ LDFLAGS_SHLIB="-shared -expect_unresolved '*' -msym -s" LDFLAGS_SHLIB_EXPORT="" ;; +*-unixware21*) +case $CC in +*/gcc|gcc ) CFLAGS_SHLIB="-fpic" ;; +*/cc|cc ) CFLAGS_SHLIB="-KPIC" ;; +esac +LDFLAGS_SHLIB="-Bdynamic -G" +LDFLAGS_SHLIB_EXPORT="" +;; esac fi
cvs commit: apache-1.3/src Configure
jim 98/03/18 12:50:40 Modified:src Configure Log: Submitted by: Jim Jagielski BUG: Configure wasn't using CC consistantly... We set CC to whatever it eventually is set to in Makefile Revision ChangesPath 1.213 +20 -12apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.212 retrieving revision 1.213 diff -u -r1.212 -r1.213 --- Configure 1998/03/17 16:08:44 1.212 +++ Configure 1998/03/18 20:50:39 1.213 @@ -661,12 +661,15 @@ ## then we look for a known compiler somewhere in PATH ## -# First, look for a CC= setting in Configure (recall, we +# First, look for a CC= setting in Configuration (recall, we # copied these to Makefile.config) +# +# If $TCC is null, then no such line exists in Configuration +# TCC=`egrep '^CC=' Makefile.config | tail -1 | awk -F= '{print $2}'` if [ "x$TCC" = "x" ]; then if [ "x$CC" = "x" ]; then -# At this point, CC is not set in Configure or above, so we +# At this point, CC is not set in Configuration or above, so we # try to find one for compilers in "gcc" "cc" "acc" "c89" do @@ -689,18 +692,23 @@ fi -## Look for OPTIM and save for later -## -TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'` - - -## Set the value of CC if need be +## Write the value of $CC to Makefile.config... We only do this +## is not done already (ie: a 'CC=' line was in Configuration). +## If there was an entry for it, then set $CC for our own internal +## use. ## if [ "x$TCC" = "x" ]; then echo "CC=$CC" >> Makefile.config +else +CC=$TCC fi +## Look for OPTIM and save for later +## +TOPTIM=`egrep '^OPTIM=' Makefile.config | tail -1 | awk -F= '{print $2}'` + + ## Check for user provided flags for shared object support ## TLDFLAGS_SHLIB=`egrep '^LDFLAGS_SHLIB=' Makefile.config | tail -1 | awk -F= '{print $2}'` @@ -823,24 +831,24 @@ ## case "$OS" in 'ULTRIX') - if [ "$TCC" = "cc" ]; then + if [ "$CC" = "cc" ]; then CFLAGS="$CFLAGS -std" fi ;; 'SCO 5') - if [ "$TCC" = "cc" ]; then + if [ "$CC" = "cc" ]; then OSBPRINTF="-K noinline" fi ;; 'HI-UX') - if [ "$TCC" = "cc" ]; then + if [ "$CC" = "cc" ]; then CFLAGS="$CFLAGS -Aa -D_HIUX_SOURCE" OPTIM=" " TOPTIM="" fi ;; 'HP-UX'|'HP-UX 10') - if [ "$TCC" = "cc" ]; then + if [ "$CC" = "cc" ]; then CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE" OPTIM=" " TOPTIM=""
cvs commit: apache-1.3/src Configure
jim 98/03/18 14:09:30 Modified:src Configure Log: PR: 1901 Submitted by: Jim Jagielski BUG: Use -n32 for IRIX only if CC is cc Revision ChangesPath 1.214 +47 -25apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- Configure 1998/03/18 20:50:39 1.213 +++ Configure 1998/03/18 22:09:29 1.214 @@ -332,16 +332,14 @@ # 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" - LDFLAGS="$LDFLAGS -n32" DEF_WANTHSREGEX=yes DBM_LIB="" if [ "$RULE_IRIXNIS" = "yes" ]; then - OS='SGI IRIX w/NIS' + OS='SGI IRIX-64 w/NIS' CFLAGS="$CFLAGS -DIRIX" LIBS="$LIBS -lsun" else - OS='SGI IRIX' + OS='SGI IRIX-64' CFLAGS="$CFLAGS -DIRIX" fi ;; @@ -349,8 +347,6 @@ DEF_WANTHSREGEX=yes DBM_LIB="" if [ "$RULE_IRIXN32" = "yes" ]; then - CFLAGS="$CFLAGS -n32" - LDFLAGS="$LDFLAGS -n32" if [ "$RULE_IRIXNIS" = "yes" ]; then OS='SGI IRIX-32 w/NIS' else @@ -753,11 +749,17 @@ ;; *-sgi-irix32) case $CC in -*/gcc|gcc ) CFLAGS_SHLIB="-fpic" ;; -*/cc|cc ) CFLAGS_SHLIB="-KPIC" ;; +*/gcc|gcc ) + CFLAGS_SHLIB="-fpic" + N32FLAG="" + ;; +*/cc|cc ) + CFLAGS_SHLIB="-KPIC" + N32FLAG="-n32" + ;; esac if [ "$RULE_IRIXN32" = "yes" ]; then -LDFLAGS_SHLIB="-n32 -shared" +LDFLAGS_SHLIB="$N32FLAG -shared" else LDFLAGS_SHLIB="-shared" fi @@ -831,28 +833,48 @@ ## case "$OS" in 'ULTRIX') - if [ "$CC" = "cc" ]; then - CFLAGS="$CFLAGS -std" - fi + case "$CC" in + */cc|cc ) CFLAGS="$CFLAGS -std" ;; + esac ;; 'SCO 5') - if [ "$CC" = "cc" ]; then - OSBPRINTF="-K noinline" - fi + case "$CC" in + */cc|cc ) OSBPRINTF="-K noinline" ;; + esac ;; 'HI-UX') - if [ "$CC" = "cc" ]; then - CFLAGS="$CFLAGS -Aa -D_HIUX_SOURCE" - OPTIM=" " - TOPTIM="" - fi + case "$CC" in + */cc|cc ) + CFLAGS="$CFLAGS -Aa -D_HIUX_SOURCE" + OPTIM=" " + TOPTIM="" + ;; + esac ;; 'HP-UX'|'HP-UX 10') - if [ "$CC" = "cc" ]; then - CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE" - OPTIM=" " - TOPTIM="" - fi + case "$CC" in + */cc|cc ) + CFLAGS="$CFLAGS -Aa -D_HPUX_SOURCE" + OPTIM=" " + TOPTIM="" + ;; + esac + ;; +*IRIX-64*) + case "$CC" in + */cc|cc ) + CFLAGS="$CFLAGS -n32" + LDFLAGS="$LDFLAGS -n32" + ;; + esac + ;; +*IRIX-32*) + case "$CC" in + */cc|cc ) + CFLAGS="$CFLAGS -n32" + LDFLAGS="$LDFLAGS -n32" + ;; + esac ;; esac
cvs commit: apache-1.3/src Configure
marc98/03/20 10:29:49 Modified:src Configure Log: OpenBSD doesn't need -ldbm. Submitted by: Bob Beck <[EMAIL PROTECTED]> Revision ChangesPath 1.216 +1 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.215 retrieving revision 1.216 diff -u -r1.215 -r1.216 --- Configure 1998/03/19 20:02:03 1.215 +++ Configure 1998/03/20 18:29:48 1.216 @@ -425,6 +425,7 @@ ;; *-openbsd*) OS='OpenBSD' + DBM_LIB="" ;; *-next-nextstep*) OS='NeXT'
cvs commit: apache-1.3/src Configure
rse 98/03/22 23:26:05 Modified:src Configure Log: Make shared object compilation more portable, because there are vendor compilers out there (for instance UnixWare's cc) which don't honor the `-o' option when used in combination with the `-c' option. They always create xx.o for xx.c and just pass `-o' to the linker phase (which doesn't exist when `-c' is used :-( ). This way shared objects are even supported under UnixWare. Revision ChangesPath 1.217 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.216 retrieving revision 1.217 diff -u -r1.216 -r1.217 --- Configure 1998/03/20 18:29:48 1.216 +++ Configure 1998/03/23 07:26:03 1.217 @@ -1416,7 +1416,7 @@ $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $< .c.so: - $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) -o $*-so.o $< + $(CC) -c $(INCLUDES) $(CFLAGS) $(CFLAGS_SHLIB) $(SPACER) $< && mv $*.o $*-so.o $(LD) $(LDFLAGS_SHLIB) -o $@ $*-so.o clean:
cvs commit: apache-1.3/src Configure
martin 98/03/25 07:26:52 Modified:src Configure Log: Use additional switches for Bs2000 C Compiler: They force CC to use mixed case and underscores in the generated *.o files (And I wonder why that is not the default in the POSIX subsystem) Without these flags, no two global variables/functions may ever appear which only differ in case. Revision ChangesPath 1.218 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.217 retrieving revision 1.218 diff -u -u -r1.217 -r1.218 --- Configure 1998/03/23 07:26:03 1.217 +++ Configure 1998/03/25 15:26:51 1.218 @@ -524,7 +524,7 @@ OS='BS2000' OSDIR='os/bs2000' CC='c89' - CFLAGS="$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV" + CFLAGS="$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV -XLLML -XLLMK" DEF_WANTHSREGEX=yes LIBS="$LIBS -lsocket -lnsl -lc" ;;
cvs commit: apache-1.3/src Configure
jim 98/03/25 12:33:41 Modified:src Configure Log: PR: 1962(??) Obtained from: Lars <[EMAIL PROTECTED]> Submitted by: Jim Jagielski Add the SCO_SV port Revision ChangesPath 1.219 +6 -0 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.218 retrieving revision 1.219 diff -u -r1.218 -r1.219 --- Configure 1998/03/25 15:26:51 1.218 +++ Configure 1998/03/25 20:33:39 1.219 @@ -471,6 +471,12 @@ LIBS="$LIBS -lsocket -lmalloc -lprot" DEF_WANTHSREGEX=no ;; +*-sco_sv*) + OS='SCO SV' + CFLAGS="$CFLAGS -DSCO" + LIBS="$LIBS -lPW -lsocket -lmalloc -lcrypt_i" + DEF_WANTHSREGEX=yes + ;; *-solaris2*) PLATOSVERS=`echo $PLAT | sed 's/^.*solaris2.//'` OS="Solaris $PLATOSVERS"
cvs commit: apache-1.3/src Configure
martin 98/03/26 06:09:51 Modified:src Configure Log: Move BS2000 compile switches to CC macro, since these flags must be present both for compile and link Revision ChangesPath 1.220 +2 -2 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.219 retrieving revision 1.220 diff -u -u -r1.219 -r1.220 --- Configure 1998/03/25 20:33:39 1.219 +++ Configure 1998/03/26 14:09:50 1.220 @@ -529,8 +529,8 @@ BS2000*-sni-sysv4*) OS='BS2000' OSDIR='os/bs2000' - CC='c89' - CFLAGS="$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV -XLLML -XLLMK" + CC='c89 -XLLML -XLLMK' + CFLAGS="$CFLAGS -DCHARSET_EBCDIC -DSVR4 -D_XPG_IV" DEF_WANTHSREGEX=yes LIBS="$LIBS -lsocket -lnsl -lc" ;;
cvs commit: apache-1.3/src Configure
dgaudet 98/03/26 16:38:51 Modified:src Configure Log: more LFLAGS stuff... this is a nop Revision ChangesPath 1.221 +0 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.220 retrieving revision 1.221 diff -u -r1.220 -r1.221 --- Configure 1998/03/26 14:09:50 1.220 +++ Configure 1998/03/27 00:38:50 1.221 @@ -389,7 +389,6 @@ OS='LynxOS 2.x' CFLAGS="$CFLAGS -D__NO_INCLUDE_WARN__ -DLYNXOS" LIBS="$LIBS -lbsd -lcrypt" - LFLAGS="$LFLAGS" DEF_WANTHSREGEX=yes ;; *486-*-bsdi*)
cvs commit: apache-1.3/src Configure
rse 98/03/01 04:56:03 Modified:src Configure Log: Make display more consequent: All other " + .." messages start with a lower case... Revision ChangesPath 1.192 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.191 retrieving revision 1.192 diff -u -r1.191 -r1.192 --- Configure 1998/02/28 15:39:28 1.191 +++ Configure 1998/03/01 12:56:02 1.192 @@ -825,7 +825,7 @@ #contain modules we want to build from both AddModule and Module #lines -echo " + Adding selected modules" +echo " + adding selected modules" MODFILES=`awk <$tmpfile '$1 == "AddModule" { printf "%s ", $2 }'` MODDIRS=`awk < $tmpfile '
cvs commit: apache-1.3/src Configure
rse 98/04/04 08:21:24 Modified:src Configure Log: typo Revision ChangesPath 1.226 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- Configure 1998/04/03 13:38:36 1.225 +++ Configure 1998/04/04 16:21:23 1.226 @@ -849,7 +849,7 @@ echo "** FAILURE: Sorry, no shared object support available." echo "** Either compile all modules statically (use AddModule instead" echo "** of SharedModule in the Configuration file) or at least provide" -echo "** us with the apropriate compiler and linker flags via the" +echo "** us with the appropriate compiler and linker flags via the" echo "** CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT entries" echo "** in the Configuration file." echo ""
cvs commit: apache-1.3/src Configure
rse 98/04/04 08:42:46 Modified:src Configure Log: Make the Perl interpreter check for the DSO fallback more robust by avoiding confusing "perl: not found" messages. Although it worked correctly this really makes the user think Perl is required for shared object support which is not the case. Revision ChangesPath 1.227 +36 -22apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.226 retrieving revision 1.227 diff -u -r1.226 -r1.227 --- Configure 1998/04/04 16:21:23 1.226 +++ Configure 1998/04/04 16:42:45 1.227 @@ -811,28 +811,42 @@ ## We take a second chance by guessing the compiler ## and linker flags from the Perl installation ## if it exists. -if [ ".`perl -V:dlsrc 2>/dev/null | grep dlopen`" != . ]; then -# cool, Perl is installed on this platform -# and actually uses the dlopen-style interface, -# so we can guess the flags from its knowledge -CFLAGS_SHLIB="`perl -V:cccdlflags | cut -d\' -f2`" -LDFLAGS_SHLIB="`perl -V:lddlflags | cut -d\' -f2`" -LDFLAGS_SHLIB_EXPORT="`perl -V:ccdlflags | cut -d\' -f2`" -# but additionally we have to inform the -# user that we are just guessing the flags -echo "" -echo "** WARNING: We have no explicit knowledge about shared object" -echo "** support for your particular platform. But perhaps you have" -echo "** luck: We were able to guess the compiler and linker flags" -echo "** for creating shared objects from your Perl installation." -echo "** If they actually work, please send the following information" -echo "** for inclusion into later releases to [EMAIL PROTECTED] or" -echo "** make a suggestion report at http://bugs.apache.org/:"; -echo "** PLATFORM=$PLAT" -echo "** CFLAGS_SHLIB=$CFLAGS_SHLIB" -echo "** LDFLAGS_SHLIB=$LDFLAGS_SHLIB" -echo "** LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT" -echo "" +PERL= +for dir in `echo $PATH | sed -e 's/:/ /g'` +do +if [ -f "$dir/perl5" ]; then +PERL="$dir/perl5" +break +fi +if [ -f "$dir/perl" ]; then +PERL="$dir/perl" +break +fi +done +if [ ".$PERL" != . ]; then +# cool, Perl is installed on this platform... +if [ ".`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != . ]; then +# ...and actually uses the dlopen-style interface, +# so we can guess the flags from its knowledge +CFLAGS_SHLIB="`perl -V:cccdlflags | cut -d\' -f2`" +LDFLAGS_SHLIB="`perl -V:lddlflags | cut -d\' -f2`" +LDFLAGS_SHLIB_EXPORT="`perl -V:ccdlflags | cut -d\' -f2`" +# but additionally we have to inform the +# user that we are just guessing the flags +echo "" +echo "** WARNING: We have no explicit knowledge about shared object" +echo "** support for your particular platform. But perhaps you have" +echo "** luck: We were able to guess the compiler and linker flags" +echo "** for creating shared objects from your Perl installation." +echo "** If they actually work, please send the following information" +echo "** for inclusion into later releases to [EMAIL PROTECTED] or" +echo "** make a suggestion report at http://bugs.apache.org/:"; +echo "** PLATFORM=$PLAT" +echo "** CFLAGS_SHLIB=$CFLAGS_SHLIB" +echo "** LDFLAGS_SHLIB=$LDFLAGS_SHLIB" +echo "** LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT" +echo "" +fi fi ;; esac
cvs commit: apache-1.3/src Configure
rse 98/04/22 07:49:39 Modified:src Configure Log: Make Marc happy... ;-) Revision ChangesPath 1.244 +5 -5 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.243 retrieving revision 1.244 diff -u -r1.243 -r1.244 --- Configure 1998/04/22 08:45:54 1.243 +++ Configure 1998/04/22 14:49:37 1.244 @@ -667,9 +667,9 @@ 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://bugs.apache.org/ - or, if your browser isn\'t - echo forms-capable, you can send them via email to - echo [EMAIL PROTECTED] If you don\'t wish to do the port + echo form at http://www.apache.org/bug_report.html - or, if your + echo browser 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 echo @@ -934,8 +934,8 @@ echo "** luck: We were able to guess the compiler and linker flags" echo "** for creating shared objects from your Perl installation." echo "** If they actually work, please send the following information" -echo "** for inclusion into later releases to [EMAIL PROTECTED] or" -echo "** make a suggestion report at http://bugs.apache.org/:"; +echo "** for inclusion into later releases to new-httpd@apache.org or make" +echo "** a suggestion report at http://www.apache.org/bug_report.html:"; echo "** PLATFORM=$PLAT" echo "** CFLAGS_SHLIB=$CFLAGS_SHLIB" echo "** LDFLAGS_SHLIB=$LDFLAGS_SHLIB"
cvs commit: apache-1.3/src Configure
brian 98/04/22 15:54:56 Modified:src Configure Log: The bug_report.html page gives an email address to contact. And who's using a forms-free browser these days anyways? Revision ChangesPath 1.245 +3 -5 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.244 retrieving revision 1.245 diff -u -r1.244 -r1.245 --- Configure 1998/04/22 14:49:37 1.244 +++ Configure 1998/04/22 22:54:55 1.245 @@ -667,11 +667,9 @@ 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/bug_report.html - or, if your - echo browser 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 + echo form at http://www.apache.org/bug_report.html. If you don\'t +echo wish to do the port yourself, please submit this output rather +echo than the patches. Thank you. echo echo Pressing on with the build process, but all bets are off. echo Do not be surprised if it fails. If it works, and even
cvs commit: apache-1.3/src Configure
rse 98/05/03 11:45:56 Modified:src Configure Log: Patterns don't work inside ticks. Submitted by: Jens-Uwe Mager Reviewed by: Ralf S. Engelschall Revision ChangesPath 1.253 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.252 retrieving revision 1.253 diff -u -r1.252 -r1.253 --- Configure 1998/05/02 11:15:08 1.252 +++ Configure 1998/05/03 18:45:55 1.253 @@ -1109,7 +1109,7 @@ ;; esac ;; -'AIX 4.[123]') +IBM?AIX?4.[123]) case $CC in */cc|cc ) CFLAGS="$CFLAGS -qnogenpcomp -qnousepcomp"
cvs commit: apache-1.3/src Configure
martin 98/05/04 09:59:22 Modified:src Configure Log: ReliantUNIX 5.44 has problems with USE_SYSVSEM_SERIALIZED_ACCEPT Revision ChangesPath 1.254 +7 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.253 retrieving revision 1.254 diff -u -u -r1.253 -r1.254 --- Configure 1998/05/03 18:45:55 1.253 +++ Configure 1998/05/04 16:59:21 1.254 @@ -591,7 +591,13 @@ ;; *-sni-sysv4*) OS='SVR4' - CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN" + case `uname -r` in + # 5.44 sometimes has problems with SysV IPC + 5.44) + CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_FCNTL_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN";; + *) + CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN";; + esac DEF_WANTHSREGEX=yes LIBS="$LIBS -lsocket -lnsl -lc" ;;
cvs commit: apache-1.3/src Configure
martin 98/05/06 14:12:40 Modified:conf httpd.conf-dist src Configure Log: Some kernels refuse to setgid(group) or semctl(IPC_SET) when the group number is above 6. The Apache Default of #-1 is interpreted by these kernels as a huge positive integer, and semctl() fails with EINVAL. A NOTE was added to the httpd.conf-dist file to warn about such a problem. I was mislead into thinking that ReliantUNIX had semctl() problems, but the reason was a wrong group id; the ReliantUNIX 5.44 fallback to USE_FCNTL_SERIALIZED_ACCEPT was therefore unnecessary, I reverted to the old default. Revision ChangesPath 1.27 +3 -0 apache-1.3/conf/httpd.conf-dist Index: httpd.conf-dist === RCS file: /export/home/cvs/apache-1.3/conf/httpd.conf-dist,v retrieving revision 1.26 retrieving revision 1.27 diff -u -u -r1.26 -r1.27 --- httpd.conf-dist 1998/04/17 08:05:50 1.26 +++ httpd.conf-dist 1998/05/06 21:12:39 1.27 @@ -45,6 +45,9 @@ # On SCO (ODT 3) use User nouser and Group nogroup # On HPUX you may not be able to use shared memory as nobody, and the # suggested workaround is to create a user www and use that user. +# NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET) +# when the value of (unsigned)Group is above 6; +# don't use Group #-1 on these systems! User nobody Group #-1 1.256 +1 -7 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.255 retrieving revision 1.256 diff -u -u -r1.255 -r1.256 --- Configure 1998/05/06 15:17:59 1.255 +++ Configure 1998/05/06 21:12:40 1.256 @@ -591,13 +591,7 @@ ;; *-sni-sysv4*) OS='SVR4' - case `uname -r` in - # 5.44 sometimes has problems with SysV IPC - 5.44) - CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_FCNTL_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN";; - *) - CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN";; - esac + CFLAGS="$CFLAGS -DSVR4 -D_XPG_IV -DHAS_DLFCN -DUSE_MMAP_FILES -DUSE_SYSVSEM_SERIALIZED_ACCEPT -DNEED_UNION_SEMUN" DEF_WANTHSREGEX=yes LIBS="$LIBS -lsocket -lnsl -lc" ;;
cvs commit: apache-1.3/src Configure
dgaudet 98/06/08 11:06:47 Modified:src Configure Log: tsk tsk brian. update to take into account brian's latest change to ncr. Revision ChangesPath 1.265 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- Configure 1998/06/06 20:48:52 1.264 +++ Configure 1998/06/08 18:06:43 1.265 @@ -616,7 +616,7 @@ LIBS="$LIBS -lsocket -lnsl" DEF_WANTHSREGEX=yes ;; -i486-ncr-sysv4) +*-ncr-sysv4) OS='NCR MP/RAS' CFLAGS="$CFLAGS -DSVR4 -DMPRAS" LIBS="$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb"
cvs commit: apache-1.3/src Configure
jim 98/07/12 06:32:51 Modified:src Configure Log: Oops... gotta recall that older (and esp. SysV-based) tr's require the '[]' method. This works fine with BSD tr's since it maps the [ to [ and the ] to ]. Cover all bases. Revision ChangesPath 1.275 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.274 retrieving revision 1.275 diff -u -r1.274 -r1.275 --- Configure 1998/07/11 10:24:05 1.274 +++ Configure 1998/07/12 13:32:50 1.275 @@ -1217,7 +1217,7 @@ echo "" >>$CONF_AUTO_H for header in $CHECK_FOR_HEADERS; do echo "/* <$header> */" >>$CONF_AUTO_H -name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr 'a-z' 'A-Z'`" +name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]' '[A-Z]'`" if ./helpers/TestCompile header $header; then eval "HAVE_${name}=1" echo "#ifndef HAVE_${name}" >>$CONF_AUTO_H
cvs commit: apache-1.3/src Configure
jim 98/07/17 10:59:53 Modified:src Configure Log: Move some uses of TestCompile down to where they make the most sense: down to a place where Makefile.config is almost totally built (except for $LIBS, which is good since that's what we will be adjusting :) ) Revision ChangesPath 1.277 +78 -73apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.276 retrieving revision 1.277 diff -u -r1.276 -r1.277 --- Configure 1998/07/13 11:32:29 1.276 +++ Configure 1998/07/17 17:59:52 1.277 @@ -1077,41 +1077,6 @@ fi -## Some OS-related stuff for the DSO mechanism: -## Finding the vendor DSO functions -## -if [ "x$using_shlib" = "x1" ] ; then -DL_LIB="" -case $PLAT in -*-ibm-aix* ) -DL_LIB="-lld" -;; -*-hp-hpux*) -if ./helpers/TestCompile func shl_load; then -: -else -if ./helpers/TestCompile lib dld; then -DL_LIB="-ldld" -fi -fi -;; -* ) -if ./helpers/TestCompile func dlopen; then -: -else -if ./helpers/TestCompile lib dl; then -DL_LIB="-ldl" -fi -fi -;; -esac -if [ ".$DL_LIB" != . ]; then -LIBS="$LIBS $DL_LIB" -echo " + using $DL_LIB for vendor DSO support" -fi -fi - - ## Now we do some OS specific adjustments... for some OSs, we need ## to adjust CFLAGS and/or OPTIM depending on which compiler we ## are going to use. This is easy, since this can be gleamed from @@ -1203,38 +1168,6 @@ ;; esac - -## Now check for existance of non-standard system header files -## and start generation of the ap_config_auto.h header -## -AP_CONFIG_AUTO_H="include/ap_config_auto.h" -echo "/*" >$AP_CONFIG_AUTO_H -echo " * ap_config_auto.h -- Automatically determined configuration stuff" >>$AP_CONFIG_AUTO_H -echo " * THIS FILE WAS AUTOMATICALLY GENERATED - DO NOT EDIT!" >>$AP_CONFIG_AUTO_H -echo " */" >>$AP_CONFIG_AUTO_H -echo "" >>$AP_CONFIG_AUTO_H -echo "#ifndef AP_CONFIG_AUTO_H" >>$AP_CONFIG_AUTO_H -echo "#define AP_CONFIG_AUTO_H" >>$AP_CONFIG_AUTO_H - -echo " + checking for system header files" -CHECK_FOR_HEADERS="dlfcn.h dl.h bstring.h crypt.h unistd.h sys/resource.h sys/select.h sys/processor.h" -for header in $CHECK_FOR_HEADERS; do -echo "" >>$AP_CONFIG_AUTO_H -echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H -name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]' '[A-Z]'`" -if ./helpers/TestCompile header $header; then -eval "HAVE_${name}=1" -echo "#ifndef HAVE_${name}" >>$AP_CONFIG_AUTO_H -echo "#define HAVE_${name} 1" >>$AP_CONFIG_AUTO_H -echo "#endif" >>$AP_CONFIG_AUTO_H -else -eval "HAVE_${name}=0" -echo "#ifdef HAVE_${name}" >>$AP_CONFIG_AUTO_H -echo "#undef HAVE_${name}" >>$AP_CONFIG_AUTO_H -echo "#endif" >>$AP_CONFIG_AUTO_H -fi -done - # SOCKS4 support: # We assume that if they are using SOCKS4, then they've # adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required, @@ -1643,25 +1576,88 @@ fi -## Continue building Makefile.config. +## Continue building Makefile.config. Fill in all entries except +## for $LIBS at this point. This implies that anything below +## can only alter $LIBS ## echo "CFLAGS1=$CFLAGS">> Makefile.config echo "OSDIR=\$(SRCDIR)/$OSDIR">> Makefile.config echo "INCDIR=\$(SRCDIR)/include" >>Makefile.config echo "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR)">> Makefile.config echo "INCLUDES1=$INCLUDES">> Makefile.config -echo "LIBS1=$LIBS">> Makefile.config echo "LDFLAGS1=$LDFLAGS">> Makefile.config echo "MFLAGS_STATIC=$MFLAGS_STATIC">> Makefile.config echo "REGLIB=$REGLIB">> Makefile.config echo "RANLIB=$RANLIB">> Makefile.config echo "SHELL=$SHELL">> Makefile.config -echo "##" >> Makefile.config -echo "## (End of automatically generated section)">> Makefile.config -echo "##" >> Makefile.config -echo "" >> Makefile.config +## Some OS-related stuff for the DSO mechanism: +## Finding the vendor DSO functions +## +if [ "x$using_shlib" = "x1" ] ; then +DL_LIB="" +case $PLAT in +*-ibm-aix* )
cvs commit: apache-1.3/src Configure
jim 98/07/17 12:08:27 Modified:src Configure Log: Work around AIX dependency Revision ChangesPath 1.278 +3 -4 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.277 retrieving revision 1.278 diff -u -r1.277 -r1.278 --- Configure 1998/07/17 17:59:52 1.277 +++ Configure 1998/07/17 19:08:26 1.278 @@ -1206,11 +1206,12 @@ esac fi -# AIX 4.x support: +# AIX 4.x support: Special Case: need to check for sys/processor.h +# before we usually would. # Processor Binding case "$PLAT" in *-ibm-aix*) -if [ ".$HAVE_SYS_PROCESSOR_H" = .1 ]; then +if ./helpers/TestCompile header sys/processor.h ; then CFLAGS="$CFLAGS -DAIX_BIND_PROCESSOR" fi ;; @@ -1646,12 +1647,10 @@ echo "/* check: #include <$header> */" >>$AP_CONFIG_AUTO_H name="`echo $header | sed -e 's:/:_:g' -e 's:\.:_:g' | tr '[a-z]' '[A-Z]'`" if ./helpers/TestCompile header $header; then -eval "HAVE_${name}=1" echo "#ifndef HAVE_${name}" >>$AP_CONFIG_AUTO_H echo "#define HAVE_${name} 1" >>$AP_CONFIG_AUTO_H echo "#endif" >>$AP_CONFIG_AUTO_H else -eval "HAVE_${name}=0" echo "#ifdef HAVE_${name}" >>$AP_CONFIG_AUTO_H echo "#undef HAVE_${name}" >>$AP_CONFIG_AUTO_H echo "#endif" >>$AP_CONFIG_AUTO_H
cvs commit: apache-1.3/src Configure
jim 98/08/12 10:04:49 Modified:src Configure Log: Work around broken sed/awk on AUX Revision ChangesPath 1.284 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.283 retrieving revision 1.284 diff -u -r1.283 -r1.284 --- Configure 1998/08/03 19:59:56 1.283 +++ Configure 1998/08/12 17:04:47 1.284 @@ -1476,7 +1476,7 @@ ## Now create modules.c ## -sed 's/_module//' $tmpfile | awk >modules.c ' +cat $tmpfile | sed 's/_module//' | awk >modules.c ' BEGIN { modules[n++] = "core" pmodules[pn++] = "core"
cvs commit: apache-1.3/src Configure
rse 98/09/19 05:47:21 Modified:src Configure Log: Let SHARED_CORE default to "yes" under Rhapsody to make the core symbols available to the module DSOs. (The other patch parts are just tab fixes) Revision ChangesPath 1.292 +4 -4 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.291 retrieving revision 1.292 diff -u -r1.291 -r1.292 --- Configure 1998/09/17 14:43:20 1.291 +++ Configure 1998/09/19 12:47:20 1.292 @@ -913,14 +913,14 @@ LDFLAGS_SHLIB_EXPORT="" SHLIB_SUFFIX_DEPTH=2 ;; - *-apple-rhapsody*) - LD_SHLIB="cc" +*-apple-rhapsody*) +LD_SHLIB="cc" CFLAGS_SHLIB="" LDFLAGS_SHLIB="-bundle -undefined suppress" LDFLAGS_SHLIB_EXPORT="" SHLIB_SUFFIX_DEPTH=0 - #DEF_SHARED_CORE=yes - ;; +DEF_SHARED_CORE=yes +;; *-solaris2*) case $CC in */gcc|gcc ) CFLAGS_SHLIB="-fpic" ;;
cvs commit: apache-1.3/src Configure
rse 98/09/20 08:48:58 Modified:src Configure Log: Wilfredo Sanchez <[EMAIL PROTECTED]>: ``So shared core is going to need a little work. I suggest we turn it off for now, since its easier to figure out that you can remove -s from the Makefile, than it is to make the shared core thing work out.'' So, let's do the comprimise and disable SHARED_CORE for Rhapsody/DSO situation even when we have problems with the stripping under install time (-s). A lot more have to be done in 1.3.2-dev to be able to fix this. For 1.3.2 is best to leave DSO for Rhapsody this way, i.e. without SHARED_CORE. Revision ChangesPath 1.293 +0 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.292 retrieving revision 1.293 diff -u -r1.292 -r1.293 --- Configure 1998/09/19 12:47:20 1.292 +++ Configure 1998/09/20 15:48:57 1.293 @@ -919,7 +919,6 @@ LDFLAGS_SHLIB="-bundle -undefined suppress" LDFLAGS_SHLIB_EXPORT="" SHLIB_SUFFIX_DEPTH=0 -DEF_SHARED_CORE=yes ;; *-solaris2*) case $CC in
cvs commit: apache-1.3/src Configure
martin 98/10/07 02:19:32 Modified:src/include httpd.h src/os/win32 registry.c src Configure Log: There we go -- Get 1.3.3 rolling! Revision ChangesPath 1.247 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.246 retrieving revision 1.247 diff -u -r1.246 -r1.247 --- httpd.h 1998/10/06 19:06:08 1.246 +++ httpd.h 1998/10/07 09:19:06 1.247 @@ -410,7 +410,7 @@ * Example: "Apache/1.1.0 MrWidget/0.1-alpha" */ -#define SERVER_BASEVERSION "Apache/1.3.3-dev"/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION "Apache/1.3.3"/* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -427,7 +427,7 @@ * For a final release, 'betaseq' should be set to '99'. * For example, Apache 1.4.2 should be '1040299' */ -#define APACHE_RELEASE 1030301 +#define APACHE_RELEASE 1030399 #define SERVER_PROTOCOL "HTTP/1.1" #ifndef SERVER_SUPPORT 1.11 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- registry.c1998/09/21 19:44:13 1.10 +++ registry.c1998/10/07 09:19:29 1.11 @@ -28,7 +28,7 @@ #define VENDOR "Apache Group" #define SOFTWARE "Apache" -#define VERSION "1.3.3 dev" +#define VERSION "1.3.3" #define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION 1.298 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.297 retrieving revision 1.298 diff -u -r1.297 -r1.298 --- Configure 1998/10/03 19:28:17 1.297 +++ Configure 1998/10/07 09:19:30 1.298 @@ -1505,7 +1505,7 @@ #select the special subtarget for shared core generation SUBTARGET=target_shared #determine additional suffixes for libhttpd.so -V=1 R=3 P=2 +V=1 R=3 P=3 if [ ".$SHLIB_SUFFIX_DEPTH" = .0 ]; then SHLIB_SUFFIX_LIST="" fi
cvs commit: apache-1.3/src Configure
jim 98/10/19 16:58:28 Modified:src Configure Log: Some changes to conserve/maintain some coding consistancy. Always quote strings and use 'x' as first preference when performing "empty string" hack. Revision ChangesPath 1.300 +29 -29apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.299 retrieving revision 1.300 diff -u -r1.299 -r1.300 --- Configure 1998/10/07 10:18:16 1.299 +++ Configure 1998/10/19 23:58:26 1.300 @@ -158,7 +158,7 @@ using_shlib=`grep '^SharedModule' $tmpfile >/dev/null && echo 1` # But perhaps later via apxs when just mod_so is compiled in! -if [ ".$using_shlib" = . ]; then +if [ "x$using_shlib" = "x" ]; then using_shlib=`grep '^AddModule modules/standard/mod_so.o' $tmpfile >/dev/null && echo 1` fi @@ -811,12 +811,12 @@ ## Now check how we can _directly_ run the C pre-processor ## TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'` -if [ ".$TCPP" != . ]; then +if [ "x$TCPP" != "x" ]; then CPP=`CC=$CC CPP=$TCPP ./helpers/findcpp.sh` else CPP=`CC=$CC ./helpers/findcpp.sh` fi -if [ ".$TCPP" = . ]; then +if [ "x$TCPP" = "x" ]; then echo "CPP=$CPP" >> Makefile.config fi echo " + setting C pre-processor to $CPP" @@ -1110,9 +1110,9 @@ break fi done -if [ ".$PERL" != . ]; then +if [ "x$PERL" != "x" ]; then # cool, Perl is installed on this platform... -if [ ".`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != . ]; then +if [ "x`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "x" ]; then # ...and actually uses the dlopen-style interface, # so we can guess the flags from its knowledge CFLAGS_SHLIB="`$PERL -V:cccdlflags | cut -d\' -f2`" @@ -1144,8 +1144,8 @@ ## the shared objects if SharedModule was used. ## if [ "x$using_shlib" = "x1" ] ; then -if [ "x$TCFLAGS_SHLIB" = x -a "x$CFLAGS_SHLIB" = x -a \ - "x$TLDFLAGS_SHLIB" = x -a "x$LDFLAGS_SHLIB" = x ]; then +if [ "x$TCFLAGS_SHLIB" = "x" -a "x$CFLAGS_SHLIB" = "x" -a \ + "x$TLDFLAGS_SHLIB" = "x" -a "x$LDFLAGS_SHLIB" = "x" ]; then echo "" echo "** FAILURE: Sorry, no shared object support available." echo "** Either compile all modules statically (use AddModule instead" @@ -1232,8 +1232,8 @@ ## OK, now handle RANLIB ## -if [ ".$RANLIB" = . ]; then -if [ ".$TRANLIB" != . ]; then +if [ "x$RANLIB" = "x" ]; then +if [ "x$TRANLIB" != "x" ]; then RANLIB=$TRANLIB else if ./helpers/PrintPath -s ranlib; then @@ -1278,7 +1278,7 @@ CFLAGS="$CFLAGS -DSOCKS -DSOCKS4" CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect" CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname" -if [ ".`grep EXTRA_ Makefile | grep lsocks`" = . ]; then +if [ "x`grep EXTRA_ Makefile | grep lsocks`" = "x" ]; then LIBS="$LIBS -L/usr/local/lib -lsocks" fi case $PLAT in @@ -1297,7 +1297,7 @@ CFLAGS="$CFLAGS -DSOCKS -DSOCKS5" CFLAGS="$CFLAGS -Dconnect=SOCKSconnect -Dselect=SOCKSselect" CFLAGS="$CFLAGS -Dgethostbyname=SOCKSgethostbyname -Dclose=SOCKSclose" -if [ ".`grep EXTRA_ Makefile | grep lsocks5`" = . ]; then +if [ "x`grep EXTRA_ Makefile | grep lsocks5`" = "x" ]; then LIBS="$LIBS -L/usr/local/lib -lsocks5" fi case $PLAT in @@ -1404,9 +1404,9 @@ ext=`echo $modfile | sed 's/^.*\.//'` modbase=`echo $modfile | sed 's/\.[^.]*$//'` - if [ x$ext = x$modfile ]; then ext=o; modbase=$modfile; modfile=$modbase.o; fi - if [ x$ext = x ] ; then ext=o; modbase=$modfile; fi - if [ x$ext = xc ] ; then ext=o; fi + if [ "x$ext" = "x$modfile" ]; then ext=o; modbase=$modfile; modfile=$modbase.o; fi + if [ "x$ext" = "x" ] ; then ext=o; modbase=$modfile; fi + if [ "x$ext" = "xc" ] ; then ext=o; fi # modbase is the path+filename without extension, ext is the # extension given, or if none, o @@ -1441,7 +1441,7 @@ . ./$tmpfile3 fi rm -f $tmpfile2 $tmpfile3 - if [ $ext != so ]; then + if [ "$ext" != "so" ]; then ext=o fi fi @@ -1449,11 +1449,11 @@ modname=`echo $modbase | sed 's/^.*\///' | \ sed 's/^mod_//' | sed 's/^lib//' | sed 's/$/_module/'` fi - if [ $ext != so ]; then + if [ "$ext" != "so" ]; then echo
cvs commit: apache-1.3/src Configure
rse 98/10/27 02:37:47 Modified:src Configure Log: Fix the LDLIBS_SHLIB for Rhapsody. Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]> Reviewed by: Ralf S. Engelschall Comment: It's not a really good fix, but it's currently the only way to fix it for Rhapsody. Actually we have to fix the complete LDFLAGS/LDFLAGS_SHLIB/EXTRA_LDFLAGS/LDFLAGS1 handling. Because this is not quite correct. But we cannot fix it to be correct without risking platforms to break (which is a bad thing for Apache 1.3.x while we're already stable) because of mutual exclusion of linker options under DSO and non-DSO situation on some platforms. Revision ChangesPath 1.303 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.302 retrieving revision 1.303 diff -u -r1.302 -r1.303 --- Configure 1998/10/23 06:50:37 1.302 +++ Configure 1998/10/27 10:37:46 1.303 @@ -940,7 +940,7 @@ *-apple-rhapsody*) LD_SHLIB="cc" CFLAGS_SHLIB="" -LDFLAGS_SHLIB="-bundle -undefined suppress" +LDFLAGS_SHLIB='$(EXTRA_LDFLAGS) -bundle -undefined suppress' LDFLAGS_SHLIB_EXPORT="" SHLIB_SUFFIX_DEPTH=0 ;;
cvs commit: apache-1.3/src Configure
jim 98/12/09 14:07:52 Modified:src Configure Log: Typo: lack of newline Revision ChangesPath 1.312 +2 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.311 retrieving revision 1.312 diff -u -r1.311 -r1.312 --- Configure 1998/12/09 21:26:14 1.311 +++ Configure 1998/12/09 22:07:51 1.312 @@ -1801,7 +1801,8 @@ sed -e 's;^EXTRA_CFLAGS=;;' -e 's;\`.*\`;;'` tmpstr=`echo $CFLAGS $TEXTRA_CFLAGS |\ sed -e 's;[ ]-;!-;g' -e 's/\\\"/\"/g' -e 's/\([^\\]\)"/\1/g'` -OIFS="$IFS" IFS='!' +OIFS="$IFS" +IFS='!' for cflag in $tmpstr; do echo "$cflag" >>$tmpconfig done
cvs commit: apache-1.3/src Configure
jim 98/12/22 07:05:18 Modified:src Configure Log: Some Configure cleanups... we were using TABs inconsistantly. We use TABs in Configure since, at times, it generates inline scripts to awk and sed, and some shells have small buffers Revision ChangesPath 1.314 +400 -400 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.313 retrieving revision 1.314 diff -u -r1.313 -r1.314 --- Configure 1998/12/22 14:49:47 1.313 +++ Configure 1998/12/22 15:05:17 1.314 @@ -264,13 +264,13 @@ case "$PLAT" in *mint) -OS="MiNT" -CFLAGS="-DMINT" -LIBS="$LIBS -lportlib -lsocket" -DEF_WANTHSREGEX=yes -;; + OS="MiNT" + CFLAGS="-DMINT" + LIBS="$LIBS -lportlib -lsocket" + DEF_WANTHSREGEX=yes + ;; *MPE/iX*) -OS='MPE/iX' + OS='MPE/iX' CFLAGS="$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE" LIBS="$LIBS -lsocket -lsvipc" LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\"" @@ -352,9 +352,9 @@ case "$PLAT" in *-hp-hpux10.01) # We know this is a problem in 10.01. - # Not a problem in 10.20. Otherwise, who knows? - CFLAGS="$CFLAGS -DSELECT_NEEDS_CAST" - ;; +# Not a problem in 10.20. Otherwise, who knows? +CFLAGS="$CFLAGS -DSELECT_NEEDS_CAST" +;; esac DEF_WANTHSREGEX=yes ;; @@ -366,7 +366,7 @@ LIBS="$LIBS -lm" ;; *-sgi-irix64) -# Note: We'd like to see patches to compile 64-bit, but for now... + # 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." DEF_WANTHSREGEX=yes @@ -584,15 +584,15 @@ LIBS="$LIBS -lsocket -lnsl -lc -lgen" ;; *-*-powermax*) -OS='SVR4' -CFLAGS="$CFLAGS -DSVR4" -DEF_WANTHSREGEX=yes -LIBS="$LIBS -lsocket -lnsl -lgen" -LD_SHLIB='cc' -LDFLAGS_SHLIB="-Zlink=so" -LDFLAGS_SHLIB_EXPORT="-Zlink=dynamic -Wl,-Bexport" -CFLAGS_SHLIB='-Zpic' -;; + OS='SVR4' + CFLAGS="$CFLAGS -DSVR4" + DEF_WANTHSREGEX=yes + LIBS="$LIBS -lsocket -lnsl -lgen" + LD_SHLIB='cc' + LDFLAGS_SHLIB="-Zlink=so" + LDFLAGS_SHLIB_EXPORT="-Zlink=dynamic -Wl,-Bexport" + CFLAGS_SHLIB='-Zpic' + ;; BS2000*-sni-sysv4*) OS='BS2000' OSDIR='os/bs2000' @@ -706,26 +706,26 @@ DEF_WANTHSREGEX=yes ;; 4850-*.*) -OS='NCR MP/RAS' -CFLAGS="$CFLAGS -DSVR4 -DMPRAS" -DEF_WANTHSREGEX=yes -LIBS="$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb" -;; + OS='NCR MP/RAS' + CFLAGS="$CFLAGS -DSVR4 -DMPRAS" + DEF_WANTHSREGEX=yes + LIBS="$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb" + ;; drs6000*) -OS='DRS6000' -CFLAGS="$CFLAGS -DSVR4" -DEF_WANTHSREGEX=yes -LIBS="$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb" -;; + OS='DRS6000' + CFLAGS="$CFLAGS -DSVR4" + DEF_WANTHSREGEX=yes + LIBS="$LIBS -lsocket -lnsl -lc -L/usr/ucblib -lucb" + ;; m88k-*-CX/SX|CYBER) -OS='Cyberguard CX/SX' -CFLAGS="$CFLAGS -D_CX_SX -Xa" -DEF_WANTHSREGEX=yes -CC='cc' -RANLIB='true' -;; + OS='Cyberguard CX/SX' + CFLAGS="$CFLAGS -D_CX_SX -Xa" + DEF_WANTHSREGEX=yes + CC='cc' + RANLIB='true' + ;; *) # default: Catch systems we don't know about -OS='Unknown and unsupported OS' + OS='Unknown and unsupported OS' echo Sorry, but we cannot grok \"$PLAT\" echo uname -m uname -m @@ -740,8 +740,8 @@ 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/bug_report.html. If you don\'t -echo wish to do the port yourself, please submit this output rather -echo than the patches. Thank you. + echo wish to do the port yourself, please submit this output rather + echo than the patches. Thank you. echo echo Pressing on with the build process, but all bets are off. echo Do not be surprised if it fails. If it works, and even @@ -753,7 +753,7 @@ ## set this if we haven't ## -if [ ".${MAKE}" = . ]; then +if [ "x${MAKE}"
cvs commit: apache-1.3/src Configure
martin 98/12/22 16:26:07 Modified:src Configure Log: Move some of the variables which are added to Makefile.config further up to a place where TestCompile can take advantage of them. This could improve some of the configuration guessing attempts and especially module inititialization routines which are called in an early stage of the Configure process. Revision ChangesPath 1.315 +12 -7 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.314 retrieving revision 1.315 diff -u -r1.314 -r1.315 --- Configure 1998/12/22 15:05:17 1.314 +++ Configure 1998/12/23 00:26:06 1.315 @@ -764,6 +764,16 @@ SUBDIRS="$OSDIR $SUBDIRS" +# Continue building the stub file +# Set variables as soon as possible so that TestCompile can use them +## +echo >>Makefile.config "OSDIR=\$(SRCDIR)/$OSDIR" +echo >>Makefile.config "INCDIR=\$(SRCDIR)/include" +echo >>Makefile.config "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR)" +echo >>Makefile.config "INCLUDES1=$INCLUDES" +echo >>Makefile.config "SHELL=$SHELL" + + ## And adjust/override WANTHSREGEX as needed ## if [ "$RULE_WANTHSREGEX" = "default" ]; then @@ -1374,7 +1384,7 @@ ## the module) is like this: ## ## 1 If extension is not given or is .c, assume .o was given and goto 3 -## 2 If extension if .module, go to D1 +## 2 If extension is .module, go to D1 ## 3 If extension is .o, look for a corresponding .c file and if ## found, go to C1 ## 4 If no .c file was found, look for a .module file (Apache module @@ -1461,7 +1471,7 @@ $CAT $modbase.module > $tmpfile2 else if [ -f $modbase.c ] ; then - # Guess module structure name in case there is not + # Guess module structure name in case there is no # module definition in this file modname=`egrep '^module .*;' $modbase.c | head -1 |\ sed 's/^module.*[ ][ ]*//' | \ @@ -1751,16 +1761,11 @@ ## can only alter $LIBS ## echo "CFLAGS1=$CFLAGS">> Makefile.config -echo "OSDIR=\$(SRCDIR)/$OSDIR">> Makefile.config -echo "INCDIR=\$(SRCDIR)/include" >>Makefile.config -echo "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR)">> Makefile.config -echo "INCLUDES1=$INCLUDES">> Makefile.config echo "LIBS_SHLIB=$LIBS_SHLIB">> Makefile.config echo "LDFLAGS1=$LDFLAGS">> Makefile.config echo "MFLAGS_STATIC=$MFLAGS_STATIC">> Makefile.config echo "REGLIB=$REGLIB">> Makefile.config echo "RANLIB=$RANLIB">> Makefile.config -echo "SHELL=$SHELL">> Makefile.config ## Some OS-related stuff for the DSO mechanism:
cvs commit: apache-1.3/src Configure
martin 99/01/01 15:48:02 Modified:src Configure Log: The $INCLUDES variable is possibly constructed by the .modules scripts, therefore it must be written only after all of the .modules handling. Submitted by: Ralf Engelschall Revision ChangesPath 1.317 +7 -7 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.316 retrieving revision 1.317 diff -u -r1.316 -r1.317 --- Configure 1999/01/01 19:04:34 1.316 +++ Configure 1999/01/01 23:48:01 1.317 @@ -770,7 +770,6 @@ echo >>Makefile.config "OSDIR=\$(SRCDIR)/$OSDIR" echo >>Makefile.config "INCDIR=\$(SRCDIR)/include" echo >>Makefile.config "INCLUDES0=-I\$(OSDIR) -I\$(INCDIR)" -echo >>Makefile.config "INCLUDES1=$INCLUDES" echo >>Makefile.config "SHELL=$SHELL" @@ -1760,12 +1759,13 @@ ## for $LIBS at this point. This implies that anything below ## can only alter $LIBS ## -echo "CFLAGS1=$CFLAGS">> Makefile.config -echo "LIBS_SHLIB=$LIBS_SHLIB">> Makefile.config -echo "LDFLAGS1=$LDFLAGS">> Makefile.config -echo "MFLAGS_STATIC=$MFLAGS_STATIC">> Makefile.config -echo "REGLIB=$REGLIB">> Makefile.config -echo "RANLIB=$RANLIB">> Makefile.config +echo "CFLAGS1=$CFLAGS" >>Makefile.config +echo "INCLUDES1=$INCLUDES" >>Makefile.config +echo "LIBS_SHLIB=$LIBS_SHLIB" >>Makefile.config +echo "LDFLAGS1=$LDFLAGS" >>Makefile.config +echo "MFLAGS_STATIC=$MFLAGS_STATIC" >>Makefile.config +echo "REGLIB=$REGLIB" >>Makefile.config +echo "RANLIB=$RANLIB" >>Makefile.config ## Some OS-related stuff for the DSO mechanism:
cvs commit: apache-1.3/src Configure
jim 99/01/02 15:54:35 Modified:src Configure Log: Fix Configure buglet when using SOCKS Submitted by: Life is hard, and then you die." <[EMAIL PROTECTED]> Revision ChangesPath 1.318 +2 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.317 retrieving revision 1.318 diff -u -r1.317 -r1.318 --- Configure 1999/01/01 23:48:01 1.317 +++ Configure 1999/01/02 23:54:34 1.318 @@ -1334,7 +1334,7 @@ CFLAGS="$CFLAGS -DSOCKS -DSOCKS4" CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect" CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname" -if [ "x`grep EXTRA_ Makefile | grep lsocks`" = "x" ]; then +if [ "x`egrep '^EXTRA_L' Makefile.config | grep lsocks`" = "x" ]; then LIBS="$LIBS -L/usr/local/lib -lsocks" fi case $PLAT in @@ -1353,7 +1353,7 @@ CFLAGS="$CFLAGS -DSOCKS -DSOCKS5" CFLAGS="$CFLAGS -Dconnect=SOCKSconnect -Dselect=SOCKSselect" CFLAGS="$CFLAGS -Dgethostbyname=SOCKSgethostbyname -Dclose=SOCKSclose" -if [ "x`grep EXTRA_ Makefile | grep lsocks5`" = "x" ]; then +if [ "x`egrep '^EXTRA_L' Makefile.config | grep lsocks5`" = "x" ]; then LIBS="$LIBS -L/usr/local/lib -lsocks5" fi case $PLAT in
cvs commit: apache-1.3/src Configure
jim 99/01/15 12:32:54 Modified:src Configure Log: Found my old System 7 shell book... Looks like this "." vs "x" stuff isn't needed at all, as long as we wrap both sides in "". So, instead we'll use "$VAR" = "" or "$VAR" = "value" and this make it crystal clear. Revision ChangesPath 1.323 +40 -40apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.322 retrieving revision 1.323 diff -u -r1.322 -r1.323 --- Configure 1999/01/10 07:48:57 1.322 +++ Configure 1999/01/15 20:32:53 1.323 @@ -82,8 +82,8 @@ ## Now handle any arguments, which, for now, is -file ## to select an alternate Configuration file ## -while [ "x$1" != "x" ]; do - if [ "x$1" = "x-file" ] ; then +while [ "$1" != "" ]; do + if [ "$1" = "-file" ] ; then shift 1; file=$1; shift 1 if [ ! -r $file ]; then echo "$file does not exist or is not readable." @@ -143,7 +143,7 @@ using_shlib=`grep '^SharedModule' $tmpfile >/dev/null && echo 1` # But perhaps later via apxs when just mod_so is compiled in! -if [ "x$using_shlib" = "x" ]; then +if [ "$using_shlib" = "" ]; then using_shlib=`grep '^AddModule modules/standard/mod_so.o' $tmpfile >/dev/null && echo 1` fi @@ -757,7 +757,7 @@ ## set this if we haven't ## -if [ "x${MAKE}" = "x" ]; then +if [ "${MAKE}" = "" ]; then MAKE='make'; export MAKE fi @@ -780,7 +780,7 @@ ## And adjust/override WANTHSREGEX as needed ## if [ "$RULE_WANTHSREGEX" = "default" ]; then - if [ "x$DEF_WANTHSREGEX" = "x" ]; then + if [ "$DEF_WANTHSREGEX" = "" ]; then RULE_WANTHSREGEX=yes else RULE_WANTHSREGEX=$DEF_WANTHSREGEX @@ -801,8 +801,8 @@ # If $TCC is null, then no such line exists in Configuration # TCC=`egrep '^CC=' Makefile.config | tail -1 | awk -F= '{print $2}'` -if [ "x$TCC" = "x" ]; then -if [ "x$CC" = "x" ]; then +if [ "$TCC" = "" ]; then +if [ "$CC" = "" ]; then # At this point, CC is not set in Configuration or above, so we # try to find one for compilers in "gcc" "cc" "acc" "c89" @@ -813,7 +813,7 @@ break fi done - if [ "x$COMPILER" = "x" ]; then + if [ "$COMPILER" = "" ]; then echo "Error: could not find any of these C compilers" echo " anywhere in your PATH: $lookedfor" echo "Configure terminated" @@ -831,7 +831,7 @@ ## If there was an entry for it, then set $CC for our own internal ## use. ## -if [ "x$TCC" = "x" ]; then +if [ "$TCC" = "" ]; then echo "CC=$CC" >> Makefile.config else CC=$TCC @@ -841,12 +841,12 @@ ## Now check how we can _directly_ run the C pre-processor ## TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'` -if [ "x$TCPP" != "x" ]; then +if [ "$TCPP" != "" ]; then CPP=`CC=$CC CPP=$TCPP ./helpers/findcpp.sh` else CPP=`CC=$CC ./helpers/findcpp.sh` fi -if [ "x$TCPP" = "x" ]; then +if [ "$TCPP" = "" ]; then echo "CPP=$CPP" >> Makefile.config fi echo " + setting C pre-processor to $CPP" @@ -912,13 +912,13 @@ ## Handle TARGET name ## -if [ "x$TTARGET" = "x" ]; then +if [ "$TTARGET" = "" ]; then TARGET=httpd echo "TARGET=$TARGET" >> Makefile.config else TARGET=$TTARGET fi -if [ "x$TARGET" != "xhttpd" ]; then +if [ "$TARGET" != "httpd" ]; then echo " + using custom target name: $TARGET" CFLAGS="$CFLAGS -DTARGET=\\\"$TARGET\\\"" fi @@ -927,7 +927,7 @@ ## We adjust now CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT as ## required. For more platforms just add the required lines below. ## -if [ "x$using_shlib" = "x1" ] ; then +if [ "$using_shlib" = "1" ] ; then LD_SHLIB="ld" DEF_SHARED_CORE=no DEF_SHARED_CHAIN=no @@ -956,7 +956,7 @@ CFLAGS_SHLIB="-fpic" LDFLAGS_SHLIB="-Bshareable" OBJFORMAT=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout` - if [ "x$OBJFORMAT" = "xelf" ]; then + if [ "$OBJFORMAT" = "elf" ]; then LDFLAGS_SHLIB_EXPORT="-Wl,-E" SHLIB_SUFFIX_DEPTH=0 else @@ -1170,9 +1170,9 @@ break fi done - if [ "x$PERL" != "x" ]; then + if [ "$PERL" != "" ]; then # cool, Perl is installed on this platform... - if [ "x`$PERL -V:dlsrc 2>/dev/null | grep dlopen`" != "x" ]; then + if [ "`$PERL -V:dlsrc 2>/dev/n
cvs commit: apache-1.3/src Configure
manoj 99/03/30 00:58:34 Modified:src Configure Log: Reviewed by: Ryan Bloom Fix DSO support under AIX 4.3. With using_shlib forced to 0, many of the settings needed in the Makefile to build DSOs don't get set. Revision ChangesPath 1.337 +0 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.336 retrieving revision 1.337 diff -u -u -r1.336 -r1.337 --- Configure 1999/03/30 06:19:07 1.336 +++ Configure 1999/03/30 08:58:33 1.337 @@ -311,7 +311,6 @@ LDFLAGS="$LDFLAGS -lm" RULE_SHARED_CORE=no DEF_SHARED_CORE=no - using_shlib=0 ;; *-ibm-aix*) OS='IBM AIX'
cvs commit: apache-1.3/src Configure
bjh 99/05/09 20:52:45 Modified:src Configure Log: Enable EXTRA_LIBS when linking OS/2 dlls Revision ChangesPath 1.343 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.342 retrieving revision 1.343 diff -u -r1.342 -r1.343 --- Configure 1999/05/04 11:21:07 1.342 +++ Configure 1999/05/10 03:52:45 1.343 @@ -1179,7 +1179,7 @@ LD_SHLIB=$CC LD_SHCORE_DEF="ApacheCoreOS2.def" LD_SHCORE_LIBS="$LIBS" - LIBS_SHLIB='$(SRCDIR)/ApacheCoreOS2.a -lsocket -lbsd' + LIBS_SHLIB='$(SRCDIR)/ApacheCoreOS2.a -lsocket -lbsd $(EXTRA_LIBS)' SHARED_CORE_EP='' SHCORE_IMPLIB='ApacheCoreOS2.a' OS_MODULE_INCLUDE='Makefile.OS2'
cvs commit: apache-1.3/src Configure PORTING
jim 98/04/21 14:00:44 Modified:src Configure PORTING Log: It's bogus to fail just because we don't have an entry in conf.h for the OS... what the hell, give it a try and continue with the build process. We may get lucky. And even if we don't, we're in no worse shape than before. Besides, we covered-our-asses because we told them all bets were off Revision ChangesPath 1.242 +6 -2 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.241 retrieving revision 1.242 diff -u -r1.241 -r1.242 --- Configure 1998/04/20 23:49:07 1.241 +++ Configure 1998/04/21 21:00:43 1.242 @@ -653,6 +653,7 @@ DEF_WANTHSREGEX=yes ;; *) # default: Catch systems we don't know about +OS='Unknown and unsupported OS' echo Sorry, but we cannot grok \"$PLAT\" echo uname -m uname -m @@ -671,8 +672,11 @@ 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 - exitcode=1 - exit 1 + echo + echo Pressing on with the build process, but all bets are off. + echo Do not be surprised if it fails. If it works, and even + echo if it does not, please contact the above address. + echo ;; esac 1.27 +7 -4 apache-1.3/src/PORTING Index: PORTING === RCS file: /export/home/cvs/apache-1.3/src/PORTING,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- PORTING 1998/04/14 03:02:39 1.26 +++ PORTING 1998/04/21 21:00:43 1.27 @@ -52,10 +52,13 @@ -- Configure cannot Grok: -- -If this happens to you, then it means that Configure doesn't -know how to configure and compile Apache for your OS. The first -course of action is the easiest: Look in Configure and see if -there are any OSs which are similar to yours. +If this happens to you, then it means that Configure doesn't know +how to configure and compile Apache for your OS. It will still try +nonetheless, but at this point, all bets are off. + +The best solution if this happens to you is to make Apache aware +of your OS. The first course of action is the easiest: Look in +Configure and see if there are any OSs which are similar to yours. For example, let's say that your OS is similar to HP-UX, but that GuessOS returns "foobar-intel-hubble". You would then edit
cvs commit: apache-1.3/src Configure CHANGES
lars99/03/20 21:07:29 Modified:src/include httpd.h src/os/win32 registry.c src Configure CHANGES Log: make source ready for the next round... Revision ChangesPath 1.274 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.273 retrieving revision 1.274 diff -u -r1.273 -r1.274 --- httpd.h 1999/03/21 04:33:41 1.273 +++ httpd.h 1999/03/21 05:07:17 1.274 @@ -413,7 +413,7 @@ * Example: "Apache/1.1.0 MrWidget/0.1-alpha" */ -#define SERVER_BASEVERSION "Apache/1.3.5"/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION "Apache/1.3.6-dev"/* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -429,7 +429,7 @@ * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'. */ -#define APACHE_RELEASE 10305100 +#define APACHE_RELEASE 10306000 #define SERVER_PROTOCOL "HTTP/1.1" #ifndef SERVER_SUPPORT 1.16 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /export/home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- registry.c1999/03/21 04:33:44 1.15 +++ registry.c1999/03/21 05:07:22 1.16 @@ -28,7 +28,7 @@ #define VENDOR "Apache Group" #define SOFTWARE "Apache" -#define VERSION "1.3.5" +#define VERSION "1.3.6 dev" #define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION 1.333 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.332 retrieving revision 1.333 diff -u -r1.332 -r1.333 --- Configure 1999/03/16 00:26:57 1.332 +++ Configure 1999/03/21 05:07:24 1.333 @@ -1568,7 +1568,7 @@ #select the special subtarget for shared core generation SUBTARGET=target_shared #determine additional suffixes for libhttpd.so - V=1 R=3 P=5 + V=1 R=3 P=6 if [ "x$SHLIB_SUFFIX_DEPTH" = "x0" ]; then SHLIB_SUFFIX_LIST="" fi 1.1289+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1288 retrieving revision 1.1289 diff -u -r1.1288 -r1.1289 --- CHANGES 1999/03/21 02:03:06 1.1288 +++ CHANGES 1999/03/21 05:07:25 1.1289 @@ -1,3 +1,6 @@ +Changes with Apache 1.3.6 + + Changes with Apache 1.3.5 *) M_INVALID needed a value within the scope of METHODS so that unknown
cvs commit: apache-1.3/src Configure CHANGES
lars99/03/22 16:36:59 Modified:src/include httpd.h src/os/win32 registry.c src Configure CHANGES Log: yet another new dev version. Revision ChangesPath 1.276 +2 -2 apache-1.3/src/include/httpd.h Index: httpd.h === RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v retrieving revision 1.275 retrieving revision 1.276 diff -u -r1.275 -r1.276 --- httpd.h 1999/03/23 00:10:59 1.275 +++ httpd.h 1999/03/23 00:36:33 1.276 @@ -413,7 +413,7 @@ * Example: "Apache/1.1.0 MrWidget/0.1-alpha" */ -#define SERVER_BASEVERSION "Apache/1.3.6"/* SEE COMMENTS ABOVE */ +#define SERVER_BASEVERSION "Apache/1.3.7-dev"/* SEE COMMENTS ABOVE */ #define SERVER_VERSION SERVER_BASEVERSION enum server_token_type { SrvTk_MIN, /* eg: Apache/1.3.0 */ @@ -429,7 +429,7 @@ * Always increases along the same track as the source branch. * For example, Apache 1.4.2 would be '10402100', 2.5b7 would be '2057'. */ -#define APACHE_RELEASE 10306100 +#define APACHE_RELEASE 10307000 #define SERVER_PROTOCOL "HTTP/1.1" #ifndef SERVER_SUPPORT 1.18 +1 -1 apache-1.3/src/os/win32/registry.c Index: registry.c === RCS file: /home/cvs/apache-1.3/src/os/win32/registry.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- registry.c1999/03/23 00:11:27 1.17 +++ registry.c1999/03/23 00:36:46 1.18 @@ -28,7 +28,7 @@ #define VENDOR "Apache Group" #define SOFTWARE "Apache" -#define VERSION "1.3.6" +#define VERSION "1.3.7 dev" #define REGKEY "SOFTWARE\\" VENDOR "\\" SOFTWARE "\\" VERSION 1.334 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.333 retrieving revision 1.334 diff -u -r1.333 -r1.334 --- Configure 1999/03/21 05:07:24 1.333 +++ Configure 1999/03/23 00:36:51 1.334 @@ -1568,7 +1568,7 @@ #select the special subtarget for shared core generation SUBTARGET=target_shared #determine additional suffixes for libhttpd.so - V=1 R=3 P=6 + V=1 R=3 P=7 if [ "x$SHLIB_SUFFIX_DEPTH" = "x0" ]; then SHLIB_SUFFIX_LIST="" fi 1.1291+3 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1290 retrieving revision 1.1291 diff -u -r1.1290 -r1.1291 --- CHANGES 1999/03/22 23:38:21 1.1290 +++ CHANGES 1999/03/23 00:36:52 1.1291 @@ -1,3 +1,6 @@ +Changes with Apache 1.3.7 + + Changes with Apache 1.3.6 *) Removed new PassAllEnv code due to DSO problems. [Lars Eilebrecht]