From 4edfdb4b15ff9f1eacaae0fb0739a54e51ca8742 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 4 Sep 2008 22:30:49 -0400 Subject: [PATCH] Rename build/*.ac to build/configure.ac.*. Also rename configure.in to configure.ac (finally) configure.in -> configure.ac build/analysis.ac -> build/configure.ac.analysis build/enable.ac -> build/configure.ac.enable build/system.ac -> build/configure.ac.system build/tools.ac -> build/configure.ac.tools build/version.ac -> build/configure.ac.version build/warnings.ac -> build/configure.ac.warnings --- autogen.sh | 9 ++++----- build/{analysis.ac => configure.ac.analysis} | 0 build/{enable.ac => configure.ac.enable} | 0 build/{system.ac => configure.ac.system} | 0 build/{tools.ac => configure.ac.tools} | 0 build/{version.ac => configure.ac.version} | 0 build/{warnings.ac => configure.ac.warnings} | 0 configure.in => configure.ac | 12 ++++++------ 8 files changed, 10 insertions(+), 11 deletions(-) rename build/{analysis.ac => configure.ac.analysis} (100%) rename build/{enable.ac => configure.ac.enable} (100%) rename build/{system.ac => configure.ac.system} (100%) rename build/{tools.ac => configure.ac.tools} (100%) rename build/{version.ac => configure.ac.version} (100%) rename build/{warnings.ac => configure.ac.warnings} (100%) rename configure.in => configure.ac (97%) diff --git a/autogen.sh b/autogen.sh index 4e32ad2cd..81bd8ab7c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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 similarity index 100% rename from build/analysis.ac rename to build/configure.ac.analysis diff --git a/build/enable.ac b/build/configure.ac.enable similarity index 100% rename from build/enable.ac rename to build/configure.ac.enable diff --git a/build/system.ac b/build/configure.ac.system similarity index 100% rename from build/system.ac rename to build/configure.ac.system diff --git a/build/tools.ac b/build/configure.ac.tools similarity index 100% rename from build/tools.ac rename to build/configure.ac.tools diff --git a/build/version.ac b/build/configure.ac.version similarity index 100% rename from build/version.ac rename to build/configure.ac.version diff --git a/build/warnings.ac b/build/configure.ac.warnings similarity index 100% rename from build/warnings.ac rename to build/configure.ac.warnings diff --git a/configure.in b/configure.ac similarity index 97% rename from configure.in rename to configure.ac index 24a398bfe..08fd0d1cb 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 ===========================================================================