rse 98/04/11 08:22:05
Modified: . STATUS Makefile.tmpl
src CHANGES Configure
Log:
Today I had personal access to a UnixWare machine and the result are these
slight changes to again make UnixWare happy.
Revision Changes Path
1.291 +1 -0 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- STATUS 1998/04/11 12:00:14 1.290
+++ STATUS 1998/04/11 15:22:02 1.291
@@ -157,6 +157,7 @@
* Build the libraries before building the rest of the tools
* Ralf's and Martin's DSO support for all SVR4-derivate Unix platforms
* THE BIG SYMBOL RENAMING
+ * Ralf's DSO configuration updates for the UnixWare platform
Available Patches:
1.14 +2 -2 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.tmpl 1998/04/10 10:34:31 1.13
+++ Makefile.tmpl 1998/04/11 15:22:02 1.14
@@ -221,7 +221,7 @@
install-programs:
@echo "===> [programs: Installing Apache httpd program and shared
objects]"
$(INSTALL_PROGRAM) $(SRC)/httpd $(sbindir)/httpd
- @if [ ".`grep 'SUBTARGET=target_shared' $(SRC)/Makefile`" != . ]; then \
+ [EMAIL PROTECTED] [ ".`grep 'SUBTARGET=target_shared' $(SRC)/Makefile`"
!= . ]; then \
echo "$(INSTALL_PROGRAM) $(SRC)/libhttpd.ep
$(libexecdir)/libhttpd.ep"; \
$(INSTALL_SCRIPT) $(SRC)/libhttpd.ep $(libexecdir)/libhttpd.ep;
\
echo "$(INSTALL_SCRIPT) $(SRC)/libhttpd.so
$(libexecdir)/libhttpd.so"; \
@@ -286,7 +286,7 @@
< $(SRC)/support/apxs > .install.tmp && \
$(INSTALL_SCRIPT) .install.tmp $(sbindir)/apxs
$(INSTALL_DATA) $(SRC)/support/apxs.8 $(mandir)/man8/apxs.8
- @if [ ".$(suexec)" = .1 ]; then \
+ [EMAIL PROTECTED] [ ".$(suexec)" = .1 ]; then \
echo "$(INSTALL_PROGRAM) $(SRC)/support/suexec $(sbindir)/suexec"; \
$(INSTALL_PROGRAM) $(SRC)/support/suexec $(sbindir)/suexec; \
echo "chown root $(sbindir)/suexec"; \
1.766 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.765
retrieving revision 1.766
diff -u -r1.765 -r1.766
--- CHANGES 1998/04/11 12:00:15 1.765
+++ CHANGES 1998/04/11 15:22:03 1.766
@@ -1,4 +1,8 @@
Changes with Apache 1.3b6
+
+ *) PORT: Updated UnixWare 2.0.x and 2.1.x entries for DSO support and made
+ APACI Makefile.tmpl "install" target more robust for sensible UnixWare
+ Make. [Ralf S. Engelschall]
*) ++++ THE BIG SYMBOL RENAMING ++++
To avoid symbol clashes with third-party code compiled into the server,
1.236 +13 -6 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- Configure 1998/04/11 14:30:32 1.235
+++ Configure 1998/04/11 15:22:04 1.236
@@ -518,23 +518,23 @@
;;
*-unixware1)
DEF_WANTHSREGEX=yes
- OS='Unixware'
+ OS='UnixWare 1.x'
CFLAGS="$CFLAGS -DUW=100"
LIBS="$LIBS -lsocket -lnsl -lcrypt"
;;
*-unixware2)
DEF_WANTHSREGEX=yes
- OS='Unixware'
+ OS='UnixWare 2.x'
CFLAGS="$CFLAGS -DUW=200"
LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
;;
*-unixware211)
- OS='Unixware 2.1.1'
+ OS='UnixWare 2.1.1'
CFLAGS="$CFLAGS -DUW=211"
LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
;;
*-unixware212)
- OS='Unixware 2.1.2'
+ OS='UnixWare 2.1.2'
CFLAGS="$CFLAGS -DUW=212"
LIBS="$LIBS -lsocket -lnsl -lcrypt -lgen"
DBM_LIB=""
@@ -813,14 +813,21 @@
LDFLAGS_SHLIB="-shared -expect_unresolved '*' -msym -s"
LDFLAGS_SHLIB_EXPORT=""
;;
+ *-unixware2)
+ case $CC in
+ */gcc|gcc ) CFLAGS_SHLIB="-fpic" ;;
+ */cc|cc ) CFLAGS_SHLIB="-KPIC" ;;
+ esac
+ LDFLAGS_SHLIB="-Bdynamic -G"
+ LDFLAGS_SHLIB_EXPORT="-Wl,-Bexport"
+ ;;
*-unixware21*)
case $CC in
*/gcc|gcc ) CFLAGS_SHLIB="-fpic" ;;
*/cc|cc ) CFLAGS_SHLIB="-KPIC" ;;
esac
LDFLAGS_SHLIB="-Bdynamic -G"
- LDFLAGS_SHLIB_EXPORT=""
- DEF_SHARED_CORE=yes
+ LDFLAGS_SHLIB_EXPORT="-Wl,-Bexport"
;;
RM*-sni-sysv4*)
# MIPS hosts can take advantage of the LDFLAGS_SHLIB_EXPORT
switch
