js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do not automatically call AC_CONFIG_COMMANDS_*

Browse source 
This causes problems with some versions of autoconf / m4. Moving it to a
function called BUILDSYS_INIT and calling that fixes it.
This commit is contained in:
Jonathan Schleifer 2014-02-24 03:55:15 +01:00
parent c67285b68e
commit 271b94aa6b
2 changed files with 64 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -9,6 +9,7 @@ dnl
dnl Specify name, version and contact e-mail of the package. dnl Specify name, version and contact e-mail of the package.
AC_INIT(name, version, e-mail) AC_INIT(name, version, e-mail)
BUILDSYS_INIT
dnl Specifies where your sources are. dnl Specifies where your sources are.
AC_CONFIG_SRCDIR(src) AC_CONFIG_SRCDIR(src)

29
m4/buildsys.m4
View file

@ -21,6 +21,7 @@ dnl ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
dnl POSSIBILITY OF SUCH DAMAGE. dnl POSSIBILITY OF SUCH DAMAGE.
dnl dnl
AC_DEFUN([BUILDSYS_INIT], [
AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS_PRE([
AC_SUBST(CC_DEPENDS, $GCC) AC_SUBST(CC_DEPENDS, $GCC)
AC_SUBST(CXX_DEPENDS, $GXX) AC_SUBST(CXX_DEPENDS, $GXX)
@ -50,16 +51,25 @@ AC_CONFIG_COMMANDS_PRE([
if x=$($TPUT setaf 1 2>/dev/null); then if x=$($TPUT setaf 1 2>/dev/null); then
AC_SUBST(TERM_SETAF1, "$x") AC_SUBST(TERM_SETAF1, "$x")
AC_SUBST(TERM_SETAF2, "$($TPUT setaf 2 2>/dev/null)") AC_SUBST(TERM_SETAF2,
AC_SUBST(TERM_SETAF3, "$($TPUT setaf 3 2>/dev/null)") "$($TPUT setaf 2 2>/dev/null)")
AC_SUBST(TERM_SETAF4, "$($TPUT setaf 4 2>/dev/null)") AC_SUBST(TERM_SETAF3,
AC_SUBST(TERM_SETAF6, "$($TPUT setaf 6 2>/dev/null)") "$($TPUT setaf 3 2>/dev/null)")
AC_SUBST(TERM_SETAF4,
"$($TPUT setaf 4 2>/dev/null)")
AC_SUBST(TERM_SETAF6,
"$($TPUT setaf 6 2>/dev/null)")
else else
AC_SUBST(TERM_SETAF1, "$($TPUT AF 1 2>/dev/null)") AC_SUBST(TERM_SETAF1,
AC_SUBST(TERM_SETAF2, "$($TPUT AF 2 2>/dev/null)") "$($TPUT AF 1 2>/dev/null)")
AC_SUBST(TERM_SETAF3, "$($TPUT AF 3 2>/dev/null)") AC_SUBST(TERM_SETAF2,
AC_SUBST(TERM_SETAF4, "$($TPUT AF 4 2>/dev/null)") "$($TPUT AF 2 2>/dev/null)")
AC_SUBST(TERM_SETAF6, "$($TPUT AF 6 2>/dev/null)") AC_SUBST(TERM_SETAF3,
"$($TPUT AF 3 2>/dev/null)")
AC_SUBST(TERM_SETAF4,
"$($TPUT AF 4 2>/dev/null)")
AC_SUBST(TERM_SETAF6,
"$($TPUT AF 6 2>/dev/null)")
fi fi
], [ ], [
AC_SUBST(TERM_EL, '\033\133K') AC_SUBST(TERM_EL, '\033\133K')
@ -81,6 +91,7 @@ AC_CONFIG_COMMANDS_POST([
touch -t 0001010000 "$DEPSFILE" touch -t 0001010000 "$DEPSFILE"
done done
]) ])
])
AC_DEFUN([BUILDSYS_PROG_IMPLIB], [ AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])