Imported Upstream version 3.0.2

[debian/gnuradio] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index ea392ea6c803e41de5bf1d4278c620b607bd41af..a72a03cc3b74174c57744227ac700f5a40ec12c7 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6399,6 +6399,27 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
         [AM_AUTOMAKE_VERSION([1.9.6])])
 
+# Figure out how to run the assembler.                      -*- Autoconf -*-
+
+# Copyright (C) 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 4
+
+# 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])
+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)])
+])
+
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
@@ -7395,7 +7416,6 @@ AC_SUBST([am__untar])
 
 m4_include([config/acx_pthread.m4])
 m4_include([config/cppunit.m4])
-m4_include([config/gr_as.m4])
 m4_include([config/gr_boost.m4])
 m4_include([config/gr_check_createfilemapping.m4])
 m4_include([config/gr_check_shm_open.m4])