[autobuild] put ax_prog_cc_for_build.m4 in top directory

- "autoreconf --force --install" should be enough to get autobuild
  running, manual cp / running ./autogen.sh should not be required
- reorganize files laters, e.g. scripts/{cmake,m4}
- include ax_prog_cc_for_build.m4 manually in configure.ac as it is not
  automatically loaded if it is not in m4/

4 files changed, 1 insertions, 2 deletions

diff --git a/autogen.sh b/autogen.sh
index aa79714e..7377a64a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,6 +10,5 @@ fi
 
 # old autoreconf/aclocal versions fail hard if m4 doesn't exist
 mkdir -p m4
-cp doc/scripts/ax_prog_cc_for_build.m4 m4/
 autoreconf --force --install
 echo "Now type './configure ...' and 'make' to compile."
diff --git a/doc/scripts/ax_prog_cc_for_build.m4 b/ax_prog_cc_for_build.m4
index 77fd346a..77fd346a 100644
--- a/doc/scripts/ax_prog_cc_for_build.m4
+++ b/ax_prog_cc_for_build.m4
diff --git a/configure.ac b/configure.ac
index cb10b245..c3758bc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([lighttpd], [1.4.43], [contact@lighttpd.net])
 AC_CONFIG_SRCDIR([src/server.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
+m4_include(ax_prog_cc_for_build.m4)
 
 AC_CANONICAL_HOST
 
diff --git a/doc/scripts/Makefile.am b/doc/scripts/Makefile.am
index 607080c2..b07b8a2f 100644
--- a/doc/scripts/Makefile.am
+++ b/doc/scripts/Makefile.am
@@ -1,5 +1,4 @@
 EXTRA_DIST= \
-	ax_prog_cc_for_build.m4 \
 	create-mime.conf.pl \
 	rrdtool-graph.sh \
 	spawn-php.sh