Libtool-ize APR.

To simplify the task, I also shifted the Makefiles to include a rules.mk
(based on APRUTIL's with a few tweaks). Still needs some work to remove the
INCLUDES setup in all the Makefiles (these can be shared).

buildconf now does more work (and generates some output)

aclocal.m4 is based on a number of M4 files, rather than standalone

apr/test/ has been updated but is probably broken in a few ways.

objs/ is now gone. we link directly from the .lo files.


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

1 files changed, 28 insertions, 0 deletions

diff --git a/buildconf b/buildconf
index e0cae5e0d..3b780217f 100755
--- a/buildconf
+++ b/buildconf
@@ -1,6 +1,34 @@
 #!/bin/sh
 
+#
+# Build aclocal.m4 from libtool's libtool.m4 and our own M4 files.
+#
+ltpath=`helpers/PrintPath libtoolize`
+ltpath=`dirname $ltpath`
+ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+echo "Incorporating $ltfile into aclocal.m4 ..."
+echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf" > aclocal.m4
+echo "dnl edits here will be lost" >> aclocal.m4
+cat helpers/apr-conf.m4 apr_common.m4 hints.m4 $ltfile >> aclocal.m4
+
+#
+# Create the libtool helper files
+#
+# Note: we copy (rather than link) them to simplify distribution.
+# Note: APR supplies its own config.guess and config.sub -- we do not
+#       rely on libtool's versions
+#
+echo "Copying libtool helper files ..."
+$ltpath/libtoolize --copy
+
+#
+# Generate the autoconf header and ./configure
+#
+echo "Creating include/arch/unix/apr_private.h.in ..."
 autoheader
+
+echo "Creating configure ..."
+### do some work to toss config.cache?
 autoconf
 
 (cd shmem/unix/mm && autoconf)