randy 99/03/29 22:19:17
Modified: . STATUS
src CHANGES Configure
src/helpers GuessOS
Log:
Fix DSO builds on BSD/OS 3.x. Must use native shlicc2 compiler.
[Randy Terbush, Covalent Technologies]
Revision Changes Path
1.681 +1 -14 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache-1.3/STATUS,v
retrieving revision 1.680
retrieving revision 1.681
diff -u -r1.680 -r1.681
--- STATUS 1999/03/27 22:43:29 1.680
+++ STATUS 1999/03/30 06:18:58 1.681
@@ -1,5 +1,5 @@
1.3 STATUS:
- Last modified at [$Date: 1999/03/27 22:43:29 $]
+ Last modified at [$Date: 1999/03/30 06:18:58 $]
Release:
@@ -74,19 +74,6 @@
=> When I find time, I can look at this. But I would appreciate
when someone other already can dive into this. My opinion
is already appended to the PR.
-
- * Randy's proposed changes for binbuild:
-
- 1. Change to build binary only distribution
- Lars: -0
-
- 2. Add 'make dist' target to call binbuild.sh
- [Roy: That would require a Makefile, which is what binbuild creates.
- I don't see any point in that.]
- Lars: -1 (Roy explained why)
-
- 3. Create toplevel 'setup' script for install to mirror win32 name
- [It is currently creating "install-bindist.sh"]
* long pathnames with many components and no AllowOverride None
Workaround is to define <Directory /> with AllowOverride None,
1.1295 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1294
retrieving revision 1.1295
diff -u -r1.1294 -r1.1295
--- CHANGES 1999/03/25 19:56:44 1.1294
+++ CHANGES 1999/03/30 06:19:06 1.1295
@@ -1,5 +1,8 @@
Changes with Apache 1.3.7
+ *) Add support for DSO module compilation on BSD/OS 3.x.
+ [Randy Terbush, Covalent Technologies]
+
*) Fix sed-substitutions in `make install': path elements like `httpd/conf'
(for instance from an APACI configure --sysconfdir=/etc/httpd/conf
option) were substituted with $(TARGET).conf, etc. Same for other
strings
1.336 +9 -0 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -r1.335 -r1.336
--- Configure 1999/03/24 09:23:54 1.335
+++ Configure 1999/03/30 06:19:07 1.336
@@ -437,6 +437,11 @@
DBM_LIB=""
DB_LIB=""
;;
+ *-bsdi3)
+ if [ "x$using_shlib" = "x1" ] ; then
+ CC="shlicc2"
+ fi
+ ;;
*-bsdi*)
OS='BSDI'
DBM_LIB=""
@@ -984,6 +989,10 @@
LDFLAGS_SHLIB="-Bshareable"
LDFLAGS_SHLIB_EXPORT=""
SHLIB_SUFFIX_DEPTH=2
+ ;;
+ *-bsdi3)
+ LD_SHLIB="shlicc2"
+ LDFLAGS_SHLIB="-r"
;;
*-bsdi)
CFLAGS_SHLIB="-fPIC"
1.58 +5 -1 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- GuessOS 1999/02/07 23:26:51 1.57
+++ GuessOS 1999/03/30 06:19:17 1.58
@@ -114,7 +114,11 @@
echo "i486-whatever-bsdi"; exit 0
;;
- BSD/386:*|BSD/OS:*)
+ BSD/386|BSD/OS:3.*)
+ echo "${MACHINE}-whatever-bsdi3"; exit 0
+ ;;
+
+ BSD/386:*|BSD/OS:*)
echo "${MACHINE}-whatever-bsdi"; exit 0
;;
