Moved hints.m4, apr_common.m4, and helpers/apr-conf.m4 into the

new build directory as apr_hints.m4, apr_common.m4, apr_network.m4,
and apr_threads.m4.  None of the macro code has changed for this
pass -- only the location.  More changes to come.


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

1 files changed, 11 insertions, 3 deletions

diff --git a/buildconf b/buildconf
index a3bda267d..5442a7f52 100755
--- a/buildconf
+++ b/buildconf
@@ -7,9 +7,17 @@ libtoolize=`helpers/PrintPath glibtoolize libtoolize`
 ltpath=`dirname $libtoolize`
 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
+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