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
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/main util.c
dgaudet 98/03/18 00:26:40
Modified:src/main util.c
Log:
It would be so nice if the whole world used unsigned chars. signed chars
make no sense to me. Oh well.
Revision ChangesPath
1.107 +1 -1 apache-1.3/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- util.c1998/03/17 07:39:57 1.106
+++ util.c1998/03/18 08:26:39 1.107
@@ -997,7 +997,7 @@
while (*s && !TEST_CHAR(*s, T_HTTP_TOKEN_STOP)) {
++s;
}
- if (!strncasecmp(start_token, tok, s - start_token)) {
+ if (!strncasecmp((const char *)start_token, (const char *)tok, s -
start_token)) {
return 1;
}
if (!*s) {
cvs commit: apache-1.2/src mod_include.c
dougm 98/03/17 20:24:02 Modified:src mod_include.c Log: #undef VOIDUSED again Submitted by: Doug MacEachern Revision ChangesPath 1.39 +1 -0 apache-1.2/src/mod_include.c Index: mod_include.c === RCS file: /export/home/cvs/apache-1.2/src/mod_include.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- mod_include.c 1998/02/21 12:25:41 1.38 +++ mod_include.c 1998/03/18 04:24:00 1.39 @@ -73,6 +73,7 @@ #ifdef USE_PERL_SSI #include "config.h" +#undef VOIDUSED #ifdef USE_SFIO #undef USE_SFIO #define USE_STDIO
cvs commit: apache-1.3/src/modules/standard mod_include.c
dougm 98/03/17 20:11:21 Modified:src/modules/standard mod_include.c Log: #undef VOIDUSED to avoid ugly redefined warning when USE_PERL_SSI is defined Submitted by: Doug MacEachern Revision ChangesPath 1.77 +1 -0 apache-1.3/src/modules/standard/mod_include.c Index: mod_include.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- mod_include.c 1998/03/13 19:20:36 1.76 +++ mod_include.c 1998/03/18 04:11:19 1.77 @@ -73,6 +73,7 @@ #ifdef USE_PERL_SSI #include "config.h" +#undef VOIDUSED #ifdef USE_SFIO #undef USE_SFIO #define USE_STDIO
cvs commit: apache-1.3/src/support htpasswd.c
marc98/03/17 16:58:35 Modified:src/support htpasswd.c Log: Why should we include sys/signal.h? That is bogus. Also, explicitly cast crypt() return to char*. We should include the right header file (ie. crypt.h), but that is painful right now. These both follow existing practice in other parts of the code. Revision ChangesPath 1.13 +1 -5 apache-1.3/src/support/htpasswd.c Index: htpasswd.c === RCS file: /export/home/cvs/apache-1.3/src/support/htpasswd.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- htpasswd.c1998/03/13 21:52:30 1.12 +++ htpasswd.c1998/03/18 00:58:34 1.13 @@ -13,11 +13,7 @@ #include #include #include -#ifdef MPE #include -#else -#include -#endif #include #include #include @@ -134,7 +130,7 @@ (void) srand((int) time((time_t *) NULL)); to64(&salt[0], rand(), 2); salt[2] = '\0'; -cpw = crypt(pw, salt); +cpw = (char *)crypt(pw, salt); free(pw); fprintf(f, "%s:%s\n", user, cpw); }
