jim 97/01/22 11:46:42
Modified: src Configure
Log:
Configure patches: Fix OSF, SCO3 and 8space->tab
Revision Changes Path
1.73 +41 -39 apache/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 ----
;;
*-sgi-irix)
DEF_WANTHSREGEX=yes
! DBM_LIB=""
if [ "$RULE_IRIXNIS" = "yes" ]; then
OS='SGI IRIX w/NIS'
CFLAGS="$CFLAGS -DIRIX"
***************
*** 271,276 ****
--- 271,277 ----
*-dec-osf*)
OS='DEC OSF/1'
CFLAGS="$CFLAGS -DOSF1"
+ LIBS="$LIBS -lm"
;;
*-qnx)
OS='QNX'
***************
*** 290,301 ****
CFLAGS="$CFLAGS -posix -DISC"
LFLAGS="$LFLAGS -posix"
LIBS="$LIBS -linet"
! DEF_WANTHSREGEX=yes
;;
*-sco3*)
OS='SCO 3'
CFLAGS="$CFLAGS -DSCO -Oacgiltz"
LIBS="$LIBS -lPW -lsocket -lmalloc -lcrypt_i"
;;
*-sco5*)
OS='SCO 5'
--- 291,303 ----
CFLAGS="$CFLAGS -posix -DISC"
LFLAGS="$LFLAGS -posix"
LIBS="$LIBS -linet"
! DEF_WANTHSREGEX=yes
;;
*-sco3*)
OS='SCO 3'
CFLAGS="$CFLAGS -DSCO -Oacgiltz"
LIBS="$LIBS -lPW -lsocket -lmalloc -lcrypt_i"
+ DEF_WANTHSREGEX=yes
;;
*-sco5*)
OS='SCO 5'
***************
*** 308,314 ****
OS='Solaris 2'
CFLAGS="$CFLAGS -DSOLARIS2"
LIBS="$LIBS -lsocket -lnsl"
! DBM_LIB=""
DEF_WANTHSREGEX=yes
;;
*-sunos4*)
--- 310,316 ----
OS='Solaris 2'
CFLAGS="$CFLAGS -DSOLARIS2"
LIBS="$LIBS -lsocket -lnsl"
! DBM_LIB=""
DEF_WANTHSREGEX=yes
;;
*-sunos4*)
***************
*** 320,336 ****
DEF_WANTHSREGEX=yes
OS='Unixware'
CFLAGS="$CFLAGS -DSVR4"
! LIBS="$LIBS -lsocket -lnsl -lcrypt"
! ;;
*-unixware2)
DEF_WANTHSREGEX=yes
OS='Unixware'
CFLAGS="$CFLAGS -DSVR4"
! LIBS="$LIBS -lsocket -lnsl -lcrypt"
! ;;
*-unixware211)
! OS='Unixware 2.1.1'
! CFLAGS="$CFLAGS -DUW"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
*-sni-sysv4*)
--- 322,338 ----
DEF_WANTHSREGEX=yes
OS='Unixware'
CFLAGS="$CFLAGS -DSVR4"
! LIBS="$LIBS -lsocket -lnsl -lcrypt"
! ;;
*-unixware2)
DEF_WANTHSREGEX=yes
OS='Unixware'
CFLAGS="$CFLAGS -DSVR4"
! LIBS="$LIBS -lsocket -lnsl -lcrypt"
! ;;
*-unixware211)
! OS='Unixware 2.1.1'
! CFLAGS="$CFLAGS -DUW"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
*-sni-sysv4*)
***************
*** 364,370 ****
LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
;;
*convex-v11*)
! OS='CONVEXOS11'
CFLAGS="$CFLAGS -DCONVEXOS11"
CC='cc'
DEF_WANTHSREGEX=yes
--- 366,372 ----
LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
;;
*convex-v11*)
! OS='CONVEXOS11'
CFLAGS="$CFLAGS -DCONVEXOS11"
CC='cc'
DEF_WANTHSREGEX=yes
***************
*** 431,437 ****
do
lookedfor="$lookedfor $compilers"
if ./helpers/PrintPath -s $compilers; then
! COMPILER="$compilers"
break
fi
done
--- 433,439 ----
do
lookedfor="$lookedfor $compilers"
if ./helpers/PrintPath -s $compilers; then
! COMPILER="$compilers"
break
fi
done
***************
*** 500,506 ****
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
if [ "$OS" = "Solaris 2" ]; then
! LIBS="$LIBS -lresolv"
fi
if grep "EXTRA_" Makefile | grep "\-lsocks" > /dev/null; then : ;
else
--- 502,508 ----
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
if [ "$OS" = "Solaris 2" ]; then
! LIBS="$LIBS -lresolv"
fi
if grep "EXTRA_" Makefile | grep "\-lsocks" > /dev/null; then : ;
else
