2002-09-30 Kevin Ryde <user42@zip.com.au>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index 1a7949c6178243339c03e1243269c37f595652e3..2ce165b0fb0ef60eaeb405fb481cf6be84151624 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-30  Kevin Ryde  <user42@zip.com.au>
+
+       * 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  <duret_g@epita.fr>
 
        * automake.in (require_variables): The fix introduced in 2002-09-19

diff --git a/m4/as.m4 b/m4/as.m4
index ad456c9231fed9be887f05e7e0ac1d15c69a447e..2db935e55dac903c781fee7bc7939beeb09a5bbd 100644 (file)
--- 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)])
+])