diff options
| -rwxr-xr-x | autogen.sh | 9 | ||||
| -rw-r--r-- | build/configure.ac.analysis (renamed from build/analysis.ac) | 0 | ||||
| -rw-r--r-- | build/configure.ac.enable (renamed from build/enable.ac) | 0 | ||||
| -rw-r--r-- | build/configure.ac.system (renamed from build/system.ac) | 0 | ||||
| -rw-r--r-- | build/configure.ac.tools (renamed from build/tools.ac) | 0 | ||||
| -rw-r--r-- | build/configure.ac.version (renamed from build/version.ac) | 0 | ||||
| -rw-r--r-- | build/configure.ac.warnings (renamed from build/warnings.ac) | 0 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.in) | 12 |
8 files changed, 10 insertions, 11 deletions
@@ -19,17 +19,16 @@ AUTOHEADER=${AUTOHEADER-autoheader} AUTOMAKE_FLAGS="--add-missing --foreign" AUTOCONF=${AUTOCONF-autoconf} -CONFIGURE_IN= -test -f configure.in && CONFIGURE_IN=configure.in -test -f configure.ac && CONFIGURE_IN=configure.ac +CONFIGURE_AC= +test -f configure.ac && CONFIGURE_AC=configure.ac -if test "X$CONFIGURE_IN" = X; then +if test "X$CONFIGURE_AC" = X; then echo "$ARGV0: ERROR: No $srcdir/configure.in or $srcdir/configure.ac found." exit 1 fi extract_version() { - grep "^ *$1" $CONFIGURE_IN build/*.ac | sed 's/.*(\[*\([^])]*\)]*).*/\1/' + grep "^ *$1" $CONFIGURE_AC build/configure.ac.* | sed 's/.*(\[*\([^])]*\)]*).*/\1/' } autoconf_min_vers=`extract_version AC_PREREQ` diff --git a/build/analysis.ac b/build/configure.ac.analysis index 7afc9e07..7afc9e07 100644 --- a/build/analysis.ac +++ b/build/configure.ac.analysis diff --git a/build/enable.ac b/build/configure.ac.enable index 062ac7ad..062ac7ad 100644 --- a/build/enable.ac +++ b/build/configure.ac.enable diff --git a/build/system.ac b/build/configure.ac.system index 21026278..21026278 100644 --- a/build/system.ac +++ b/build/configure.ac.system diff --git a/build/tools.ac b/build/configure.ac.tools index 7f135254..7f135254 100644 --- a/build/tools.ac +++ b/build/configure.ac.tools diff --git a/build/version.ac b/build/configure.ac.version index 0d8805c0..0d8805c0 100644 --- a/build/version.ac +++ b/build/configure.ac.version diff --git a/build/warnings.ac b/build/configure.ac.warnings index 27b790d7..27b790d7 100644 --- a/build/warnings.ac +++ b/build/configure.ac.warnings diff --git a/configure.in b/configure.ac index 24a398bf..08fd0d1c 100644 --- a/configure.in +++ b/configure.ac @@ -12,12 +12,12 @@ dnl =========================================================================== dnl dnl The order of the includes here is rather important dnl -m4_include(build/version.ac) dnl macros setting up various version declares -m4_include(build/tools.ac) dnl checks for tools we use -m4_include(build/system.ac) dnl checks for system functions, headers, libs -m4_include(build/enable.ac) dnl macros for backend/feature enablement -m4_include(build/warnings.ac) dnl checks for compiler warning -m4_include(build/analysis.ac) dnl checks for analysis tools (lcov, etc) +m4_include(build/configure.ac.version) dnl macros setting up various version declares +m4_include(build/configure.ac.tools) dnl checks for tools we use +m4_include(build/configure.ac.system) dnl checks for system functions, headers, libs +m4_include(build/configure.ac.enable) dnl macros for backend/feature enablement +m4_include(build/configure.ac.warnings) dnl checks for compiler warning +m4_include(build/configure.ac.analysis) dnl checks for analysis tools (lcov, etc) AC_CACHE_SAVE dnl =========================================================================== |