Autotools enhancement

Now libtoolize copy missing files
Adds m4 macro directory for aclocal
etc.

Makefile.am

@@ -1,4 +1,5 @@
-SUBDIRS = src tests
+ACLOCAL_AMFLAGS= -I m4
+SUBDIRS =
 
 if HAVE_DOXYGEN
 SUBDIRS += docs
@@ -7,3 +8,10 @@ docs:
 	-cd docs; rm doxyfile.stamp; make doxyfile.stamp
 .PHONY: docs
 endif
+
+SUBDIRS += src
+
+if CHECK
+SUBDIRS += tests
+endif
+

autogen.sh

@@ -6,7 +6,7 @@ rm -fR configure aclocal.m4 autom4te.cache src/Makefile.in tests/Makefile.in Mak
 
 [ "$1" = "clean" ] && exit 0
 
-libtoolize
+libtoolize -i
 aclocal
 autoconf
 automake -a -c

configure.ac

@@ -5,10 +5,19 @@ AC_PREREQ([2.69])
 AC_INIT([PyFCGI], [0.0.1], [yann.weber@member.fsf.org])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([include/config.h])
+AC_CONFIG_MACRO_DIRS([m4])
 
 
 AC_ARG_ENABLE([debug],
 	AS_HELP_STRING([--enable-debug], [Enable debug, disabling -Werror, etc.]))
+AC_ARG_ENABLE([check],
+	AS_HELP_STRING([--disable-debug], [Disable unit test support]),
+	[case "${enableval}" in
+		yes) check=true;;
+		no) check=false;;
+		*) AC_MSG_ERROR([bad value ${enableval} for --disable-check]);;
+	esac],[check=true])
+AM_CONDITIONAL([CHECK], [test x$check = xtrue])
 
 AC_USE_SYSTEM_EXTENSIONS
 AC_GNU_SOURCE
@@ -62,7 +71,14 @@ AC_C_INLINE
 AC_CHECK_LIB([fcgi], [FCGI_Accept])
 AC_CHECK_LIB([rt], [timer_create])
 AC_CHECK_LIB([pthread], [sem_open shm_open])
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+if test "x$check" = "xtrue"
+then
+	PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [],
+		AC_MSG_FAILURE([Unabe to locate (check unit test c framework).
+You can run ./configure --disable-check if you do not need unit tests.
+]))
+	AS_IF([test x"${enable_debug}" = x"yes"], [CK_FORK=no], [])
+fi
 
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h syslog.h unistd.h sem.h time.h])

docs/Makefile.in

@@ -90,7 +90,10 @@ host_triplet = @host@
 @HAVE_DOXYGEN_TRUE@am__append_1 = $(top_srcdir)/docs/man/man1/pyfcgi.1
 subdir = docs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)