Patch: AS fix

[Tom Tromey]

I'm checking this in.  It cleans up the AS/ASFLAGS mess.
Well, it creates a new mess anyway.

Tom

Index: ChangeLog
from  Tom Tromey  <address@hidden>
        * m4/Makefile.am (m4data_DATA): Added as.m4.
        * m4/as.m4: New file.

Index: automake.texi
===================================================================
RCS file: /cvs/automake/automake/automake.texi,v
retrieving revision 1.226
diff -u -r1.226 automake.texi
--- automake.texi 2001/07/21 18:19:38 1.226
+++ automake.texi 2001/07/21 18:34:17
@@ -1385,6 +1385,11 @@
 variable @code{lispdir} to the full path to Emacs' site-lisp directory.
 @cvindex AM_PATH_LISPDIR
 
address@hidden AM_PROG_AS
+Use this macro when you have assembly code in your project.  This will
+choose the assembler for you (by default the C compiler), and will set
address@hidden if required.
+
 @item AM_PROG_CC_C_O
 This is like @code{AC_PROG_CC_C_O}, but it generates its results in the
 manner required by automake.  You must use this instead of
@@ -1662,6 +1667,7 @@
 * Program variables::           Variables used when building a program
 * Yacc and Lex::                Yacc and Lex support
 * C++ Support::
+* Assembly Support::
 * Fortran 77 Support::
 * Java Support::
 * Support for Other Languages::
@@ -2307,7 +2313,7 @@
 covered here, please report the new name so it can be added to the list.
 
 
address@hidden C++ Support, Fortran 77 Support, Yacc and Lex, Programs
address@hidden C++ Support, Assembly Support, Yacc and Lex, Programs
 @section C++ Support
 
 @cindex C++ support
@@ -2337,8 +2343,26 @@
 The command used to actually link a C++ program.
 @end vtable
 
+
address@hidden Assembly Support, Fortran 77 Support, C++ Support, Programs
address@hidden Assembly Support
+
+Automake includes some support for assembly code.
+
+The variable @code{AS} holds the name of the compiler used to build
+assembly code.  This compiler must work a bit like a C compiler; in
+particular it must accept @samp{-c} and @samp{-o}.  The value of
address@hidden is passed to the compilation.
address@hidden AS
address@hidden ASFLAGS
+
+You are required to set @code{AS} and @code{ASFLAGS} via
address@hidden  The autoconf macro @code{AM_PROG_AS} will do this
+for you.  Unless they are already set, it simply sets @code{AS} to the C
+compiler and @code{ASFLAGS} to the C compiler flags.
+
 
address@hidden Fortran 77 Support, Java Support, C++ Support, Programs
address@hidden Fortran 77 Support, Java Support, Assembly Support, Programs
 @comment  node-name,  next,  previous,  up
 @section Fortran 77 Support
 
Index: m4/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/m4/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- m4/Makefile.am 2001/07/20 01:25:14 1.33
+++ m4/Makefile.am 2001/07/21 18:34:17
@@ -1,7 +1,7 @@
 ## Process this file with automake to create Makefile.in
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
+m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
 dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 lex.m4 lispdir.m4 make.m4 \
 maintainer.m4 minuso.m4 missing.m4 multi.m4 obstack.m4 protos.m4 \
 ptrdiff.m4 python.m4 regex.m4 sanity.m4 strip.m4 strtod.m4 termios.m4 \
Index: m4/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/m4/Makefile.in,v
retrieving revision 1.155
diff -u -r1.155 Makefile.in
--- m4/Makefile.in 2001/07/20 01:25:14 1.155
+++ m4/Makefile.in 2001/07/21 18:34:17
@@ -67,7 +67,7 @@
 install_sh = @install_sh@
 
 m4datadir = $(datadir)/aclocal
-m4data_DATA = auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
+m4data_DATA = as.m4 auxdir.m4 ccstdc.m4 cond.m4 depend.m4 depout.m4 \
 dmalloc.m4 error.m4 gcj.m4 header.m4 init.m4 lex.m4 lispdir.m4 make.m4 \
 maintainer.m4 minuso.m4 missing.m4 multi.m4 obstack.m4 protos.m4 \
 ptrdiff.m4 python.m4 regex.m4 sanity.m4 strip.m4 strtod.m4 termios.m4 \
Index: m4/as.m4
===================================================================
RCS file: as.m4
diff -N as.m4
--- /dev/null   Tue May  5 13:32:27 1998
+++ m4/as.m4 Sat Jul 21 11:34:17 2001
@@ -0,0 +1,11 @@
+# Figure out how to run the assembler.
+
+# AM_PROG_AS
+AC_DEFUN([AM_PROG_AS],
+[# By default we simply use the C compiler to build assembly code.
+AC_REQUIRE([AC_PROG_CC])
+: ${AS='$(CC)'}
+# Set ASFLAGS if not already set.
+: ${ASFLAGS='$(CFLAGS)'}
+AC_SUBST(AS)
+AC_SUBST(ASFLAGS)])