Fixes ticket:92.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3922 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/config/gr_as.m4 b/config/gr_as.m4
deleted file mode 100644 (file)
index 08e3f93..0000000
--- a/config/gr_as.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-# Figure out how to run the assembler.             -*- Autoconf -*-
-
-# serial 2
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
-
-# I just copy and renamed this from automake-1.6.3 so we should work 
-# under both 1.4-p6 and later.  -eb
-
-# GR_PROG_AS
-# ----------
-AC_DEFUN([GR_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)])

diff --git a/configure.ac b/configure.ac
index a27afefc55c749e17ed36814977f24a15703ac44..f3254a33f2adadca59e7ac66b7e1c1c301e23315 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ LF_CONFIGURE_CXX
 LF_SET_WARNINGS
 GR_SET_GPROF
 GR_SET_PROF
-GR_PROG_AS
+AM_PROG_AS
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL

diff --git a/gr-howto-write-a-block/config/gr_as.m4 b/gr-howto-write-a-block/config/gr_as.m4
deleted file mode 100644 (file)
index 08e3f93..0000000
--- a/gr-howto-write-a-block/config/gr_as.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-# Figure out how to run the assembler.             -*- Autoconf -*-
-
-# serial 2
-
-# Copyright 2001 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Boston, MA
-# 02110-1301, USA.
-
-# I just copy and renamed this from automake-1.6.3 so we should work 
-# under both 1.4-p6 and later.  -eb
-
-# GR_PROG_AS
-# ----------
-AC_DEFUN([GR_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)])

diff --git a/gr-howto-write-a-block/configure.ac b/gr-howto-write-a-block/configure.ac
index 9cf72f09301acb24bfb25fabd300bed1fe652ffb..76fc1d4777fe6999f7e27f6bdf2be7bb331b2ebb 100644 (file)
--- a/gr-howto-write-a-block/configure.ac
+++ b/gr-howto-write-a-block/configure.ac
@@ -32,7 +32,7 @@ LF_CONFIGURE_CXX
 LF_SET_WARNINGS
 GR_SET_GPROF
 GR_SET_PROF
-GR_PROG_AS
+AM_PROG_AS
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL