Fix autoconf header and include path so trunk builds.

This commit is contained in:
b1v1r
2010-08-31 18:35:55 +00:00
parent 7aa83b5c9f
commit 3a10f9fb8d
24 changed files with 1696 additions and 1445 deletions

View File

@@ -1,8 +1,8 @@
m4trace:aclocal.m4:851: -1- m4_include([acinclude/libtool.m4])
m4trace:aclocal.m4:852: -1- m4_include([acinclude/ltoptions.m4])
m4trace:aclocal.m4:853: -1- m4_include([acinclude/ltsugar.m4])
m4trace:aclocal.m4:854: -1- m4_include([acinclude/ltversion.m4])
m4trace:aclocal.m4:855: -1- m4_include([acinclude/lt~obsolete.m4])
m4trace:aclocal.m4:880: -1- m4_include([acinclude/libtool.m4])
m4trace:aclocal.m4:881: -1- m4_include([acinclude/ltoptions.m4])
m4trace:aclocal.m4:882: -1- m4_include([acinclude/ltsugar.m4])
m4trace:aclocal.m4:883: -1- m4_include([acinclude/ltversion.m4])
m4trace:aclocal.m4:884: -1- m4_include([acinclude/lt~obsolete.m4])
m4trace:configure.ac:9: -1- AC_INIT([modsecurity], [2.5], [support@modsecurity.org])
m4trace:configure.ac:9: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:9: -1- m4_pattern_forbid([_AC_])
@@ -151,11 +151,11 @@ m4trace:configure.ac:9: -1- m4_pattern_allow([^host_alias$])
m4trace:configure.ac:9: -1- AC_SUBST([target_alias])
m4trace:configure.ac:9: -1- AC_SUBST_TRACE([target_alias])
m4trace:configure.ac:9: -1- m4_pattern_allow([^target_alias$])
m4trace:configure.ac:13: -1- AC_CONFIG_HEADERS([modsecurity_config.h])
m4trace:configure.ac:13: -1- AC_CONFIG_HEADERS([modsecurity_config_auto.h])
m4trace:configure.ac:14: -1- AC_CONFIG_AUX_DIR([build])
m4trace:configure.ac:17: -1- AM_INIT_AUTOMAKE([-Wall -Werror foreign])
m4trace:configure.ac:17: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.ac:17: -1- AM_AUTOMAKE_VERSION([1.9.6])
m4trace:configure.ac:17: -1- AM_AUTOMAKE_VERSION([1.10.2])
m4trace:configure.ac:17: -1- AC_REQUIRE_AUX_FILE([install-sh])
m4trace:configure.ac:17: -1- AC_SUBST([INSTALL_PROGRAM])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
@@ -166,14 +166,13 @@ m4trace:configure.ac:17: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
m4trace:configure.ac:17: -1- AC_SUBST([INSTALL_DATA])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([INSTALL_DATA])
m4trace:configure.ac:17: -1- m4_pattern_allow([^INSTALL_DATA$])
m4trace:configure.ac:17: -1- AC_SUBST([am__isrc], [' -I$(srcdir)'])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([am__isrc])
m4trace:configure.ac:17: -1- m4_pattern_allow([^am__isrc$])
m4trace:configure.ac:17: -1- _AM_SUBST_NOTMAKE([am__isrc])
m4trace:configure.ac:17: -1- AC_SUBST([CYGPATH_W])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([CYGPATH_W])
m4trace:configure.ac:17: -1- m4_pattern_allow([^CYGPATH_W$])
m4trace:configure.ac:17: -1- _m4_warn([obsolete], [The macro `AC_FOREACH' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:196: AC_FOREACH is expanded from...
aclocal.m4:666: _AM_SET_OPTIONS is expanded from...
aclocal.m4:368: AM_INIT_AUTOMAKE is expanded from...
configure.ac:17: the top level])
m4trace:configure.ac:17: -1- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([PACKAGE])
m4trace:configure.ac:17: -1- m4_pattern_allow([^PACKAGE$])
@@ -188,6 +187,7 @@ m4trace:configure.ac:17: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
m4trace:configure.ac:17: -1- m4_pattern_allow([^VERSION$])
m4trace:configure.ac:17: -1- AH_OUTPUT([VERSION], [/* Version number of package */
@%:@undef VERSION])
m4trace:configure.ac:17: -1- AC_REQUIRE_AUX_FILE([missing])
m4trace:configure.ac:17: -1- AC_SUBST([ACLOCAL])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([ACLOCAL])
m4trace:configure.ac:17: -1- m4_pattern_allow([^ACLOCAL$])
@@ -212,7 +212,11 @@ m4trace:configure.ac:17: -1- m4_pattern_allow([^STRIP$])
m4trace:configure.ac:17: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([INSTALL_STRIP_PROGRAM])
m4trace:configure.ac:17: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
m4trace:configure.ac:17: -1- AC_SUBST([mkdir_p])
m4trace:configure.ac:17: -1- AC_REQUIRE_AUX_FILE([install-sh])
m4trace:configure.ac:17: -1- AC_SUBST([MKDIR_P])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([MKDIR_P])
m4trace:configure.ac:17: -1- m4_pattern_allow([^MKDIR_P$])
m4trace:configure.ac:17: -1- AC_SUBST([mkdir_p], ["$MKDIR_P"])
m4trace:configure.ac:17: -1- AC_SUBST_TRACE([mkdir_p])
m4trace:configure.ac:17: -1- m4_pattern_allow([^mkdir_p$])
m4trace:configure.ac:17: -1- AC_SUBST([AWK])
@@ -320,9 +324,12 @@ m4trace:configure.ac:20: -1- m4_pattern_allow([^AMDEP_TRUE$])
m4trace:configure.ac:20: -1- AC_SUBST([AMDEP_FALSE])
m4trace:configure.ac:20: -1- AC_SUBST_TRACE([AMDEP_FALSE])
m4trace:configure.ac:20: -1- m4_pattern_allow([^AMDEP_FALSE$])
m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
m4trace:configure.ac:20: -1- AC_SUBST([AMDEPBACKSLASH])
m4trace:configure.ac:20: -1- AC_SUBST_TRACE([AMDEPBACKSLASH])
m4trace:configure.ac:20: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
m4trace:configure.ac:20: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
m4trace:configure.ac:20: -1- AC_SUBST_TRACE([CCDEPMODE])
m4trace:configure.ac:20: -1- m4_pattern_allow([^CCDEPMODE$])
@@ -335,6 +342,8 @@ m4trace:configure.ac:20: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
m4trace:configure.ac:20: -1- AC_SUBST([am__fastdepCC_FALSE])
m4trace:configure.ac:20: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
m4trace:configure.ac:20: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
m4trace:configure.ac:20: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
m4trace:configure.ac:20: -1- AC_SUBST([SED])
m4trace:configure.ac:20: -1- AC_SUBST_TRACE([SED])
m4trace:configure.ac:20: -1- m4_pattern_allow([^SED$])
@@ -488,6 +497,8 @@ m4trace:configure.ac:24: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
m4trace:configure.ac:24: -1- AC_SUBST([am__fastdepCC_FALSE])
m4trace:configure.ac:24: -1- AC_SUBST_TRACE([am__fastdepCC_FALSE])
m4trace:configure.ac:24: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
m4trace:configure.ac:24: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
m4trace:configure.ac:24: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
m4trace:configure.ac:25: -1- AC_SUBST([CPP])
m4trace:configure.ac:25: -1- AC_SUBST_TRACE([CPP])
m4trace:configure.ac:25: -1- m4_pattern_allow([^CPP$])
@@ -659,6 +670,8 @@ m4trace:configure.ac:88: -1- m4_pattern_allow([^BUILD_APACHE2_MODULE_TRUE$])
m4trace:configure.ac:88: -1- AC_SUBST([BUILD_APACHE2_MODULE_FALSE])
m4trace:configure.ac:88: -1- AC_SUBST_TRACE([BUILD_APACHE2_MODULE_FALSE])
m4trace:configure.ac:88: -1- m4_pattern_allow([^BUILD_APACHE2_MODULE_FALSE$])
m4trace:configure.ac:88: -1- _AM_SUBST_NOTMAKE([BUILD_APACHE2_MODULE_TRUE])
m4trace:configure.ac:88: -1- _AM_SUBST_NOTMAKE([BUILD_APACHE2_MODULE_FALSE])
m4trace:configure.ac:108: -1- AM_CONDITIONAL([BUILD_extentions], [test "$build_extentions" -eq 1])
m4trace:configure.ac:108: -1- AC_SUBST([BUILD_extentions_TRUE])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([BUILD_extentions_TRUE])
@@ -666,6 +679,8 @@ m4trace:configure.ac:108: -1- m4_pattern_allow([^BUILD_extentions_TRUE$])
m4trace:configure.ac:108: -1- AC_SUBST([BUILD_extentions_FALSE])
m4trace:configure.ac:108: -1- AC_SUBST_TRACE([BUILD_extentions_FALSE])
m4trace:configure.ac:108: -1- m4_pattern_allow([^BUILD_extentions_FALSE$])
m4trace:configure.ac:108: -1- _AM_SUBST_NOTMAKE([BUILD_extentions_TRUE])
m4trace:configure.ac:108: -1- _AM_SUBST_NOTMAKE([BUILD_extentions_FALSE])
m4trace:configure.ac:128: -1- AM_CONDITIONAL([BUILD_MLOGC], [test "$build_mlogc" -eq 1])
m4trace:configure.ac:128: -1- AC_SUBST([BUILD_MLOGC_TRUE])
m4trace:configure.ac:128: -1- AC_SUBST_TRACE([BUILD_MLOGC_TRUE])
@@ -673,6 +688,8 @@ m4trace:configure.ac:128: -1- m4_pattern_allow([^BUILD_MLOGC_TRUE$])
m4trace:configure.ac:128: -1- AC_SUBST([BUILD_MLOGC_FALSE])
m4trace:configure.ac:128: -1- AC_SUBST_TRACE([BUILD_MLOGC_FALSE])
m4trace:configure.ac:128: -1- m4_pattern_allow([^BUILD_MLOGC_FALSE$])
m4trace:configure.ac:128: -1- _AM_SUBST_NOTMAKE([BUILD_MLOGC_TRUE])
m4trace:configure.ac:128: -1- _AM_SUBST_NOTMAKE([BUILD_MLOGC_FALSE])
m4trace:configure.ac:147: -1- AM_CONDITIONAL([BUILD_ALP2], [test "$build_alp2" -eq 1])
m4trace:configure.ac:147: -1- AC_SUBST([BUILD_ALP2_TRUE])
m4trace:configure.ac:147: -1- AC_SUBST_TRACE([BUILD_ALP2_TRUE])
@@ -680,6 +697,8 @@ m4trace:configure.ac:147: -1- m4_pattern_allow([^BUILD_ALP2_TRUE$])
m4trace:configure.ac:147: -1- AC_SUBST([BUILD_ALP2_FALSE])
m4trace:configure.ac:147: -1- AC_SUBST_TRACE([BUILD_ALP2_FALSE])
m4trace:configure.ac:147: -1- m4_pattern_allow([^BUILD_ALP2_FALSE$])
m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([BUILD_ALP2_TRUE])
m4trace:configure.ac:147: -1- _AM_SUBST_NOTMAKE([BUILD_ALP2_FALSE])
m4trace:configure.ac:166: -1- AM_CONDITIONAL([BUILD_DOCS], [test "$build_docs" -eq 1])
m4trace:configure.ac:166: -1- AC_SUBST([BUILD_DOCS_TRUE])
m4trace:configure.ac:166: -1- AC_SUBST_TRACE([BUILD_DOCS_TRUE])
@@ -687,6 +706,8 @@ m4trace:configure.ac:166: -1- m4_pattern_allow([^BUILD_DOCS_TRUE$])
m4trace:configure.ac:166: -1- AC_SUBST([BUILD_DOCS_FALSE])
m4trace:configure.ac:166: -1- AC_SUBST_TRACE([BUILD_DOCS_FALSE])
m4trace:configure.ac:166: -1- m4_pattern_allow([^BUILD_DOCS_FALSE$])
m4trace:configure.ac:166: -1- _AM_SUBST_NOTMAKE([BUILD_DOCS_TRUE])
m4trace:configure.ac:166: -1- _AM_SUBST_NOTMAKE([BUILD_DOCS_FALSE])
m4trace:configure.ac:464: -1- sinclude([build/find_pcre.m4])
m4trace:configure.ac:465: -1- sinclude([build/find_apr.m4])
m4trace:configure.ac:466: -1- sinclude([build/find_apu.m4])
@@ -925,4 +946,5 @@ m4trace:configure.ac:566: -1- AC_SUBST_TRACE([builddir])
m4trace:configure.ac:566: -1- AC_SUBST_TRACE([abs_builddir])
m4trace:configure.ac:566: -1- AC_SUBST_TRACE([abs_top_builddir])
m4trace:configure.ac:566: -1- AC_SUBST_TRACE([INSTALL])
m4trace:configure.ac:566: -1- AC_SUBST_TRACE([MKDIR_P])
m4trace:configure.ac:566: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])