rse 98/07/21 03:20:27
Modified: src CHANGES Configure
Log:
Fix SHARED_CORE rule: The CFLAGS_SHLIB variable is no longer doubled
(compilers complained) and the .so.V.R.P filename extension was adjusted to
correctly reflect the 1.3.2 version.
PR: 2644
Revision Changes Path
1.974 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.973
retrieving revision 1.974
diff -u -r1.973 -r1.974
--- CHANGES 1998/07/20 16:40:37 1.973
+++ CHANGES 1998/07/21 10:20:24 1.974
@@ -1,5 +1,10 @@
Changes with Apache 1.3.2
+ *) Fix SHARED_CORE rule: The CFLAGS_SHLIB variable is no longer doubled
+ (compilers complained) and the .so.V.R.P filename extension was adjusted
+ to correctly reflect the 1.3.2 version.
+ [Ralf S. Engelschall] PR#2644
+
*) SECURITY: Plug "..." and other canonicalization holes under OS/2.
[Brian Havard]
1.280 +21 -21 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -r1.279 -r1.280
--- Configure 1998/07/18 10:51:52 1.279
+++ Configure 1998/07/21 10:20:25 1.280
@@ -1057,25 +1057,6 @@
fi
####################################################################
-## Set the value of the shared libary flags, if they aren't explicitly
-## set in the configuration file
-##
-if [ "x$using_shlib" = "x1" ] ; then
- if [ "x$TCFLAGS_SHLIB" = "x" ]; then
- echo "CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE" >> Makefile.config
- fi
- if [ "x$TLD_SHLIB" = "x" ]; then
- echo "LD_SHLIB=$LD_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
- echo "LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT" >> Makefile.config
- 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
@@ -1401,7 +1382,7 @@
RULE_SHARED_CORE=$DEF_SHARED_CORE
fi
if [ ".$RULE_SHARED_CORE" = .yes ]; then
- echo " + enabling generation of Apache core as DSO"
+ echo " + enabling generation of Apache core as DSO"
# shuffle compiler flags from shlib variant to standard
CFLAGS="$CFLAGS $CFLAGS_SHLIB"
CFLAGS_SHLIB=""
@@ -1410,7 +1391,7 @@
# select the special subtarget for shared core generation
SUBTARGET=target_shared
# determine additional suffixes for libhttpd.so
- V=1 R=3 P=0
+ V=1 R=3 P=2
if [ ".$SHLIB_SUFFIX_DEPTH" = .0 ]; then
SHLIB_SUFFIX_LIST=""
fi
@@ -1426,6 +1407,25 @@
if [ ".$SHLIB_SUFFIX_DEPTH" = .all ]; then
SHLIB_SUFFIX_LIST="$V $V.$R $V.$R.$P"
fi
+ fi
+fi
+
+####################################################################
+## Set the value of the shared libary flags, if they aren't explicitly
+## set in the configuration file
+##
+if [ "x$using_shlib" = "x1" ] ; then
+ if [ "x$TCFLAGS_SHLIB" = "x" ]; then
+ echo "CFLAGS_SHLIB=$CFLAGS_SHLIB -DSHARED_MODULE" >> Makefile.config
+ fi
+ if [ "x$TLD_SHLIB" = "x" ]; then
+ echo "LD_SHLIB=$LD_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
+ echo "LDFLAGS_SHLIB_EXPORT=$LDFLAGS_SHLIB_EXPORT" >> Makefile.config
fi
fi
