Split acinclude.m4 into its constituent parts for easy upgrading

autogen.sh

@@ -4,7 +4,7 @@ echo "Generating build information using autoconf"
 echo "This may take a while ..."
 
 # Regenerate configuration files
-cp acinclude.m4 aclocal.m4
+cat acinclude/* >aclocal.m4
 found=false
 for autoconf in autoconf autoconf259 autoconf-2.59
 do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi