chocolate-doom/chocpkg
0
0
Fork 0
mirror of https://github.com/chocolate-doom/chocpkg.git synced 2024-11-30 16:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-run autoreconf if configure.ac has been changed.

Browse source 
Because we have to set up a particular environment before running
autoreconf, it's desirable to be able to do this by running chocpkg
build. However, to support this use case we need to be detect when the
configure script is out of date. Make the logic for when to run
autoreconf take this into account, rather than just checking for when
the file doesn't exist.
This commit is contained in:
Simon Howard 2016-02-25 21:55:05 -05:00
parent 08ef9ca39c
commit 537df0751c
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
chocpkg/modules/build_autotools.sh
View file

@ -3,6 +3,17 @@ build_autotools::init() {
PACKAGE_CONFIGURE_OPTS="$@"
}
need_autoreconf() {
if [ -e configure.in ] && [ ! -e configure.ac ]; then
local configure_ac=configure.in
else
local configure_ac=configure.ac
fi
# Need to run autoreconf if configure script has not been generated,
# or if configure.ac has been changed.
[ ! -e configure ] || [ $configure_ac -nt configure ]
}
# This function encapsulates the "./configure; make" process that does the
# actual build of the package. This should work for most autotools-based
# packages but the intention is that this can be overrriden by packages.
@ -14,7 +25,7 @@ do_build() {
# If we're checking out from a version control repository, we may need
# to run the autotools commands first to generate the configure script.
if [ ! -e configure ] && ([ -e configure.ac ] || [ -e configure.in ]); then
if need_autoreconf; then
autoreconf -fi
fi