Stop copying APR's libtool. And pass enough parameters to apr's subconfig

Justin Erenkrantz · Justin Erenkrantz · commit 83999a072e2b · 2002-03-09T19:29:18.000Z
so that it can figure out where we would like libtool to be installed. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93816 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.34-dev
 
+  *) Stop installing libtool for APR and tell APR where it should place
+     its copy of libtool (via our installbuildpath layout variable).
+     [Justin Erenkrantz]
+
   *) New directive ProxyIOBufferSize. Sets the size of the buffer used
      when reading from a remote HTTP server in proxy. [Graham Leggett]
 
diff --git a/Makefile.in b/Makefile.in
@@ -89,11 +89,7 @@ install-build:
 	@sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
 	    config_vars.mk > $(installbuilddir)/config_vars.mk; \
 	cp build/*.mk $(installbuilddir); \
-	cp $(top_srcdir)/build/instdso.sh $(installbuilddir); \
-	cp srclib/apr/libtool $(installbuilddir); \
-	if test -f srclib/apr/shlibtool; then \
-	    cp srclib/apr/shlibtool $(installbuilddir); \
-	fi
+	cp $(top_srcdir)/build/instdso.sh $(installbuilddir);
 
 htdocs-srcdir = $(top_srcdir)/docs/docroot
 
diff --git a/configure.in b/configure.in
@@ -56,7 +56,7 @@ orig_prefix="$prefix"
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
 
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir --datadir=$datadir --with-installbuilddir=$installbuilddir")
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
