www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

Allow Apache to use libtool 1.4. In order to do this, we check the

Browse Source 
libtool version of the machine, and we add the correct flags to the build.
We also had to remove the --disable-shared in order to make this work
correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90479 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan Bloom
2001-08-21 23:41:35 +00:00
parent 5895fdce9f
commit f8b2c67405
3 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
STATUS
View File

@@ -1,5 +1,5 @@
APACHE 2.0 STATUS: -*-text-*-
Last modified at [$Date: 2001/08/17 00:29:08 $]
Last modified at [$Date: 2001/08/21 23:41:35 $]
Release:
@@ -45,19 +45,6 @@ RELEASE SHOWSTOPPERS:
added to the filter chain after any filters specified in enclosing
containers.
* remove the --disable-shared from the subdir config of APR(UTIL)
before the final release. (in fact, it might even be nice to
allow for Apache config/build against an already-installed
APR(UTIL))
Note: we need to do a "make install" for APR(UTIL) so the shared
libraries can be installed properly. We could also use that
point to install include files (rather than have Apache
know everything that needs to be installed from the
sub-packages). The original impetus for doing the
disable-shared was because the shared lib wasn't getting
installed and a "make clean" in aprutil would make Apache
fail to load.
* mod_dir should normally redirect ALL directory requests which do
not include a trailing slash on the URI. However, if a "notes"
flag is set (say, via BrowserMatch), this behavior will be

8
build/rules.mk
View File

@@ -73,11 +73,11 @@ ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
COMPILE = $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
CXX_COMPILE = $(CXX) $(ALL_CXXFLAGS) $(ALL_CPPFLAGS) $(ALL_INCLUDES)
SH_COMPILE = $(SH_LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
SH_CXX_COMPILE = $(SH_LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
SH_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) -prefer-pic -c $< && touch $@
SH_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -prefer-pic-c $< && touch $@
LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) -c $< && touch $@
LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -c $< && touch $@
LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) -prefer-non-pic -static -c $< && touch $@
LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) -prefer-non-pic -static -c $< && touch $@
# Link-related commands

24
configure.in
View File

@@ -45,11 +45,11 @@ dnl ## Run configure for packages Apache uses
echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --disable-shared --prefix=$prefix")
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 --disable-shared --prefix=$prefix")
APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix")
echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
@@ -103,15 +103,31 @@ case $host in
MK_IMPLIB="emximp"
other_targets="$other_targets os2core"
INSTALL_PROG_FLAGS="-e .exe"
SHLTCFLAGS=""
LTCFLAGS=""
;;
*)
if test "x$LTFLAGS" = "x"; then
LTFLAGS='--silent'
fi
LIBTOOL='$(SHELL) $(top_builddir)/srclib/apr/libtool $(LTFLAGS)'
SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
libtoolversion=`$abs_builddir/srclib/apr/libtool --version`
case $libtoolversion in
*1.4*)
SH_LIBTOOL='$(LIBTOOL)'
SHLTCFLAGS="-prefer-pic"
LTCFLAGS="-prefer-non-pic -static"
;;
*)
SH_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool $(LTFLAGS)'
SHLTCFLAGS=""
LTCFLAGS=""
;;
esac
;;
esac
APACHE_SUBST(SHLTCFLAGS)
APACHE_SUBST(LTCFLAGS)
case $host in
*-apple-aux3*)
@@ -385,7 +401,7 @@ case $host in
;;
esac
AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile,,[
AC_OUTPUT($APACHE_OUTPUT_FILES support/apxs support/apachectl support/dbmmanage support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk,,[
APACHE_GEN_MAKEFILES
])