Skip to content

Commit

Permalink
Rename build/*.ac to build/configure.ac.*.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Behdad Esfahbod committed Sep 5, 2008
1 parent 49f0602 commit 4edfdb4
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 11 deletions.
9 changes: 4 additions & 5 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
12 changes: 6 additions & 6 deletions configure.in → configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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 ===========================================================================
Expand Down

0 comments on commit 4edfdb4

Please sign in to comment.