Remove the need for aclocal.m4 by copying libtool.m4 into build and

directly including the macro files into configure.in.


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

1 files changed, 5 insertions, 19 deletions

diff --git a/buildconf b/buildconf
index 0b173b325..80f5366de 100755
--- a/buildconf
+++ b/buildconf
@@ -1,25 +1,6 @@
 #!/bin/sh
 
 #
-# Build aclocal.m4 from libtool's libtool.m4 and our own M4 files.
-#
-libtoolize=`build/PrintPath glibtoolize libtoolize`
-ltpath=`dirname $libtoolize`
-ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
-echo "Incorporating $ltfile into aclocal.m4 ..."
-cat > aclocal.m4 <<EOF
-dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf
-dnl Edits here will be lost
-
-sinclude(build/apr_common.m4)
-sinclude(build/apr_network.m4)
-sinclude(build/apr_threads.m4)
-sinclude(build/apr_hints.m4)
-
-EOF
-cat $ltfile >> aclocal.m4
-
-#
 # Create the libtool helper files
 #
 # Note: we copy (rather than link) them to simplify distribution.
@@ -27,6 +8,11 @@ cat $ltfile >> aclocal.m4
 #       rely on libtool's versions
 #
 echo "Copying libtool helper files ..."
+#
+libtoolize=`build/PrintPath glibtoolize libtoolize`
+ltpath=`dirname $libtoolize`
+ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+cp -f $ltfile build/
 $libtoolize --copy --automake
 
 #