You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2001/12/01 18:42:18 UTC
cvs commit: httpd-2.0/server Makefile.in
trawick 01/12/01 09:42:18
Modified: . CHANGES configure.in
server Makefile.in
Log:
Get shared builds of libapr and libaprutil, as well as Apache DSOs,
working on AIX.
Submitted by: a cast of many, reverse engineering libtool to
figure out how to work around its oddities/limitations/
bugs on AIX
(Jeff Trawick coded these changes but it took a lot of
help)
Revision Changes Path
1.464 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.463
retrieving revision 1.464
diff -u -r1.463 -r1.464
--- CHANGES 2001/12/01 05:38:22 1.463
+++ CHANGES 2001/12/01 17:42:17 1.464
@@ -1,5 +1,9 @@
Changes with Apache 2.0.30-dev
+ *) Get shared builds of libapr and libaprutil, as well as Apache DSOs,
+ working on AIX. [Aaron Bannert, Dick Dunbar <RL...@pacbell.net>,
+ Gary Hook <gh...@us.ibm.com>, Victor Orlikowski, Jeff Trawick]
+
*) Fix the handling of SSI directives in which the ">" of the
terminating "-->" is the last byte in a file [Brian Pane]
1.187 +3 -11 httpd-2.0/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/httpd-2.0/configure.in,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- configure.in 2001/11/22 20:29:11 1.186
+++ configure.in 2001/12/01 17:42:18 1.187
@@ -48,23 +48,15 @@
AC_CANONICAL_SYSTEM
-case $host in
- *-ibm-aix*)
- disable_shared="--disable-shared"
- ;;
- *)
- disable_shared=""
-esac
-
orig_prefix="$prefix"
echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix $disable_shared")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix")
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
-APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix $disable_shared")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix")
echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
@@ -280,7 +272,7 @@
case $host in
*-ibm-aix*)
HTTPD_LDFLAGS="$HTTPD_LDFLAGS -Wl,-bE:$abs_builddir/server/httpd.exp"
- SH_LDFLAGS="$SH_LDFLAGS -Wl,-bI:$abs_builddir/server/httpd.exp"
+ SH_LDFLAGS="$SH_LDFLAGS -Wl,-bI:$abs_builddir/server/httpd.exp -Wl,-bI:$abs_builddir/srclib/apr/apr.exp -Wl,-bI:$abs_builddir/srclib/apr-util/aprutil.exp"
;;
*beos)
SH_LDFLAGS='$(top_builddir)/_APP_'
1.70 +2 -2 httpd-2.0/server/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/server/Makefile.in,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- Makefile.in 2001/10/18 18:35:18 1.69
+++ Makefile.in 2001/12/01 17:42:18 1.70
@@ -65,5 +65,5 @@
@echo "#! ." > $@
@echo "* This file was AUTOGENERATED at build time." >> $@
@echo "* Please do not edit by hand." >> $@
- $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
- $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | grep -v apr_ | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@
+ $(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) export_vars.h | grep -v apr_ | sed -e 's/^\#[^!]*//' | sed -e '/^$$/d' >> $@