Cleanup the build process a bit more. The Apache configure

script no longer creates its own helper scripts, it just
uses APR's.
Submitted by:	jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88530 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index bbd58e8e3c11203d143e9a8e27f68d86d56fc367..e0b8a5f5e583574bf66822ef4f92718629de551b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.15-dev
 
+  *) Cleanup the build process a bit more.  The Apache configure
+     script no longer creates its own helper scripts, it just
+     uses APR's.  
+     [jean-frederic clere <jfrederic.clere@fujitsu-siemens.com>]
+
   *) Stop the forced downgrade of the connection to HTTP/1.0 for
      proxy requests.  [Graham Leggett]
 

diff --git a/build/build2.mk b/build/build2.mk
index 8f0b1e6c649809d3500e24da6ed5176be12577dd..6c07b96581be93f0f47a55f67eeec183b2490996 100644 (file)
--- a/build/build2.mk
+++ b/build/build2.mk
@@ -58,15 +58,13 @@ include $(BUILD_BASE)/generated_lists
 
 TOUCH_FILES = mkinstalldirs install-sh missing
 
-LT_TARGETS = ltconfig ltmain.sh config.guess config.sub
-
 config_h_in = include/ap_config_auto.h.in
 apr_configure = srclib/apr/configure
 mm_configure = srclib/apr/shmem/unix/mm/configure
 pcre_configure = srclib/pcre/configure
 aprutil_configure = srclib/apr-util/configure
 
-APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in)
+APACHE_TARGETS = $(TOUCH_FILES) configure $(config_h_in)
 
 APR_TARGETS = $(apr_configure) $(mm_configure) $(aprutil_configure)
 
@@ -89,9 +87,6 @@ aclocal.m4: acinclude.m4 $(libtool_m4)
        @echo "dnl edits here will be lost" >>$@
        @cat acinclude.m4 $(libtool_m4) >> $@
 
-$(LT_TARGETS):
-       libtoolize $(AMFLAGS) --force
-
 $(config_h_in): configure
 # explicitly remove target since autoheader does not seem to work 
 # correctly otherwise (timestamps are not updated)

diff --git a/build/rules.mk b/build/rules.mk
index de0c5f400eef0f8a1c63f9dff9a894a895594a71..9d05a727e7e8da5d8e9ce9872bce39642afffa6d 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -188,7 +188,7 @@ clean-x:
        rm -rf .libs
 
 distclean: distclean-recursive clean-x
-       rm -f config.cache config.log config.status config_vars.mk libtool \
+       rm -f config.cache config.log config.status config_vars.mk \
        stamp-h Makefile shlibtool .deps $(DISTCLEAN_TARGETS)
 
 include $(builddir)/.deps

diff --git a/configure.in b/configure.in
index 28f2d0500a7423a217ad4e1952cd2e3d07e8b0a5..74aa47bc52478141b6182f06bf3a8f11afaa3b2f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ AC_PREREQ(2.13)
 AC_INIT(acinclude.m4)
 
 AC_CONFIG_HEADER(include/ap_config_auto.h)
-AC_CONFIG_AUX_DIR(.)
+AC_CONFIG_AUX_DIR(srclib/apr/build)
  
 dnl ## This is the central place where Apache's version should be kept.
 dnl AM_INIT_AUTOMAKE(apache, 2.0-dev)
@@ -20,6 +20,7 @@ test "$prefix" = "NONE" && prefix='/usr/local'
 dnl Absolute source/build directory
 abs_srcdir=`(cd $srcdir && pwd)`
 abs_builddir=`pwd`
+aprbuild=$abs_srcdir/srclib/apr/build
 
 MKDIR=$abs_srcdir/srclib/apr/build/mkdir.sh
 
@@ -155,7 +156,7 @@ AM_PROG_LIBTOOL
 APACHE_LIBTOOL_SILENT
 
 if test "$apache_need_shared" = "yes"; then
-  $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
+  $SHELL $aprbuild/ltconfig --output=shlibtool --disable-static --srcdir=$aprbuild --cache-file=./config.cache $aprbuild/ltmain.sh
   case $PLATFORM in
     *os390)
       CFLAGS="$CFLAGS -Wc,DLL,EXPORTALL"