More configure cleanup.

apache2/Makefile.in

@@ -70,7 +70,6 @@ mod_security2.la: $(MOD_SECURITY2_H) *.c
 	for f in $(MOD_SECURITY2); do \
 		src="$$src $$f.c"; \
 	done; \
-	echo "$(COMPILE_APACHE_MOD) $(EXTRA_CFLAGS) $$src"; \
 	$(COMPILE_APACHE_MOD) $(EXTRA_CFLAGS) $$src
 
 ### Experimental Test Framework (UNIX only right now)

apache2/configure.in

@@ -6,9 +6,36 @@ dnl
 
 AC_PREREQ(2.50)
 
-AC_INIT
+AC_INIT(ModSecurity, 2.5, mod-security-users@lists.sourceforge.net, modsecurity-apache)
-AC_CONFIG_HEADER(mod_security2_config.h)
+AC_CONFIG_SRCDIR([mod_security2.c])
-AC_CONFIG_AUX_DIR(build)
+AC_CONFIG_HEADER([mod_security2_config.h])
+AC_CONFIG_AUX_DIR([build])
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_CPP
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_C_RESTRICT
+AC_TYPE_SIZE_T
+AC_STRUCT_TM
+AC_TYPE_UINT8_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_CHECK_FUNCS([atexit getcwd memset strcasecmp strchr strdup strerror strncasecmp strrchr strstr strtol])
 
 # Include M4 macros
 sinclude(build/find_pcre.m4)
@@ -19,7 +46,7 @@ sinclude(build/find_apu.m4)
 
 AC_MSG_NOTICE(looking for Apache module support via DSO through APXS)
 AC_ARG_WITH(apxs,
-            [AS_HELP_STRING([[--with-apxs=[=FILE]]],
+            [AS_HELP_STRING([[--with-apxs=FILE]],
                             [FILE is the path to apxs; defaults to "apxs".])],
 [
   if test "$withval" = "yes"; then
@@ -31,8 +58,9 @@ AC_ARG_WITH(apxs,
 
 if test -z "$APXS"; then
   for i in /usr/sbin \
-           /usr/local/apache/bin \
+           /usr/local/apache22/bin \
            /usr/local/apache2/bin \
+           /usr/local/apache/bin \
            /usr/local/sbin ; do
     if test -f "$i/apxs2"; then
       APXS="$i/apxs2"
@@ -66,7 +94,6 @@ VERSION_OK
   APXS_CFLAGS="`$APXS -q CFLAGS`"
   APXS_LDFLAGS="`$APXS -q LDFLAGS`"
   APXS_LIBS="`$APXS -q LIBS`"
-  AC_MSG_NOTICE([APXS_INCLUDES=${APXS_INCLUDES}])
 else
   AC_MSG_ERROR(couldn't find APXS)
 fi
@@ -82,10 +109,10 @@ AC_SUBST(APXS_LDFLAGS)
 AC_SUBST(APXS_LIBS)
 
 CHECK_PCRE()
-CHECK_LUA()
-CHECK_LIBXML()
 CHECK_APR()
 CHECK_APU()
+CHECK_LIBXML()
+CHECK_LUA()
 
 AC_CONFIG_FILES([Makefile])
 

apache2/mod_security2_config.h.in

@@ -1,5 +1,75 @@
 /* mod_security2_config.h.in.  Generated from configure.in by autoheader.  */
 
+/* Define to 1 if you have the `atexit' function. */
+#undef HAVE_ATEXIT
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#undef HAVE_FCNTL_H
+
+/* Define to 1 if you have the `getcwd' function. */
+#undef HAVE_GETCWD
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <limits.h> header file. */
+#undef HAVE_LIMITS_H
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strcasecmp' function. */
+#undef HAVE_STRCASECMP
+
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strdup' function. */
+#undef HAVE_STRDUP
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -14,3 +84,37 @@
 
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
+   <pthread.h>, or <semaphore.h> is not used. If the typedef was allowed, the
+   #define below would cause a syntax error. */
+#undef _UINT8_T
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
+#undef inline
+#endif
+
+/* Define to rpl_malloc if the replacement function should be used. */
+#undef malloc
+
+/* Define to equivalent of C99 restrict keyword, or to nothing if this is not
+   supported. Do not define if restrict is supported directly. */
+#undef restrict
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
+/* Define to the type of an unsigned integer type of width exactly 8 bits if
+   such a type exists and the standard includes do not define it. */
+#undef uint8_t