Combine generator subdirectories into one.

[wrappi.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 79ed9c9..cde231e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,10 @@ AM_INIT_AUTOMAKE([foreign])
 
 AC_CONFIG_MACRO_DIR([m4])
 
+dnl Allow all GNU/Linux functions.
+dnl autoconf complains unless this is very early in the file.
+AC_USE_SYSTEM_EXTENSIONS
+
 AC_PROG_LIBTOOL
 
 AC_PROG_SED
@@ -34,9 +38,33 @@ test "x$U" != "x" && AC_MSG_ERROR([Compiler not ANSI compliant])
 
 AM_PROG_CC_C_O
 
+AC_ARG_ENABLE([gcc-warnings],
+    [AS_HELP_STRING([--enable-gcc-warnings],
+                    [turn on lots of GCC warnings (for developers)])],
+    [case $enableval in
+       yes|no) ;;
+       *)      AC_MSG_ERROR([bad value $enableval for gcc-warnings option]) ;;
+     esac
+     gcc_warnings=$enableval],
+    [gcc_warnings=no]
+)
+
+if test "$gcc_warnings" = yes; then
+    # XXX With gnulib we can improve this in future.
+    WARN_CFLAGS="-Wall"
+    AC_SUBST([WARN_CFLAGS])
+    WERROR_CFLAGS="-Werror"
+    AC_SUBST([WERROR_CFLAGS])
+fi
+
 dnl Check support for 64 bit file offsets.
 AC_SYS_LARGEFILE
 
+dnl Check for gperf.
+AC_CHECK_PROG([GPERF],[gperf],[gperf],[no])
+test "x$GPERF" = "xno" &&
+     AC_MSG_ERROR([gperf must be installed])
+
 dnl Check for OCaml compiler.
 AC_PROG_OCAML
 if test "$OCAMLC" = "no"; then
@@ -62,10 +90,9 @@ AC_SUBST(LIB_MINOR)
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile
                  APIs/Makefile
+                 daemon/Makefile
                  examples/Makefile
                  generator/Makefile
-                 generator-lib/config.ml
-                 generator-lib/Makefile
-                 generator-macros/Makefile
+                 generator/config.ml
                  lib/Makefile])
 AC_OUTPUT