changes from running bootstrap and then make maintainer-clean

[debian/gnuradio] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 1aa9740eade1e98e659b4391d226c6980f0d1cc3..76605cacb314d4629971c4cefd191383f976cb59 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -980,6 +980,23 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]]
 sys.exit(sys.hexversion < minverhex)"
   AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])])
 
+# Copyright (C) 2001, 2003, 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.
+
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
@@ -1199,36 +1216,39 @@ m4_include([config/gr_check_createfilemapping.m4])
 m4_include([config/gr_check_memalign.m4])
 m4_include([config/gr_check_shm_open.m4])
 m4_include([config/gr_doxygen.m4])
-m4_include([config/gr_fortran.m4])
+m4_include([config/gr_git.m4])
 m4_include([config/gr_gprof.m4])
 m4_include([config/gr_lib64.m4])
 m4_include([config/gr_libgnuradio_core_extra_ldflags.m4])
 m4_include([config/gr_no_undefined.m4])
-m4_include([config/gr_omnithread.m4])
 m4_include([config/gr_pwin32.m4])
 m4_include([config/gr_python.m4])
 m4_include([config/gr_qwt.m4])
 m4_include([config/gr_qwtplot3d.m4])
 m4_include([config/gr_scripting.m4])
 m4_include([config/gr_set_md_cpu.m4])
-m4_include([config/gr_subversion.m4])
 m4_include([config/gr_swig.m4])
 m4_include([config/gr_sysv_shm.m4])
+m4_include([config/gr_version.m4])
 m4_include([config/grc_build.m4])
 m4_include([config/grc_docs.m4])
 m4_include([config/grc_gcell.m4])
 m4_include([config/grc_gnuradio_core.m4])
 m4_include([config/grc_gnuradio_examples.m4])
+m4_include([config/grc_gr_atsc.m4])
 m4_include([config/grc_gr_audio_alsa.m4])
 m4_include([config/grc_gr_audio_jack.m4])
 m4_include([config/grc_gr_audio_oss.m4])
 m4_include([config/grc_gr_audio_osx.m4])
 m4_include([config/grc_gr_audio_portaudio.m4])
 m4_include([config/grc_gr_audio_windows.m4])
+m4_include([config/grc_gr_comedi.m4])
 m4_include([config/grc_gr_cvsd_vocoder.m4])
 m4_include([config/grc_gr_gcell.m4])
 m4_include([config/grc_gr_gpio.m4])
 m4_include([config/grc_gr_gsm_fr_vocoder.m4])
+m4_include([config/grc_gr_msdd6000.m4])
+m4_include([config/grc_gr_noaa.m4])
 m4_include([config/grc_gr_pager.m4])
 m4_include([config/grc_gr_qtgui.m4])
 m4_include([config/grc_gr_radar_mono.m4])
@@ -1242,9 +1262,6 @@ m4_include([config/grc_gr_video_sdl.m4])
 m4_include([config/grc_gr_wxgui.m4])
 m4_include([config/grc_grc.m4])
 m4_include([config/grc_gruel.m4])
-m4_include([config/grc_mblock.m4])
-m4_include([config/grc_omnithread.m4])
-m4_include([config/grc_pmt.m4])
 m4_include([config/grc_usrp.m4])
 m4_include([config/grc_usrp2.m4])
 m4_include([config/lf_cc.m4])