From d8f03ac4f057ab263453ae372919018ae840414a Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Mon, 30 Sep 2002 18:34:46 +0000 Subject: [PATCH] 2002-09-30 Kevin Ryde * m4/as.m4 (AM_PROG_AS): Let CCAS and CCASFLAGS default to the actual values of $CC and $CFLAGS (as opposed to $(CC) and $(CFLAGS)), so configure tests can use them. Use AC_ARG_VAR instead of AC_SUBST. --- ChangeLog | 6 ++++++ m4/as.m4 | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a7949c6..2ce165b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-30 Kevin Ryde + + * m4/as.m4 (AM_PROG_AS): Let CCAS and CCASFLAGS default to the actual + values of $CC and $CFLAGS (as opposed to $(CC) and $(CFLAGS)), so + configure tests can use them. Use AC_ARG_VAR instead of AC_SUBST. + 2002-09-30 Alexandre Duret-Lutz * automake.in (require_variables): The fix introduced in 2002-09-19 diff --git a/m4/as.m4 b/m4/as.m4 index ad456c92..2db935e5 100644 --- a/m4/as.m4 +++ b/m4/as.m4 @@ -24,8 +24,8 @@ AC_DEFUN([AM_PROG_AS], [# By default we simply use the C compiler to build assembly code. AC_REQUIRE([AC_PROG_CC]) -: ${CCAS='$(CC)'} -# Set ASFLAGS if not already set. -: ${CCASFLAGS='$(CFLAGS)'} -AC_SUBST(CCAS) -AC_SUBST(CCASFLAGS)]) +test "${CCAS+set}" = set || CCAS=$CC +test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS +AC_ARG_VAR([CCAS], [Assembler compiler command (defaults to CC)]) +AC_ARG_VAR([CCASFLAGS], [Assembler compiler flags (defaults to CFLAGS)]) +]) -- 2.43.5