Completed fix for ticket #1. Merged r3160:3168 from

branches/developers/jcorgan/m4mfixes into trunk.


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

10 files changed, 77 insertions, 81 deletions

diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4
index 153f0ff38..c1d88b9e4 100644
--- a/config/grc_gr_audio_alsa.m4
+++ b/config/grc_gr_audio_alsa.m4
@@ -20,17 +20,17 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_AUDIO_ALSA],[
     AC_CONFIG_SRCDIR([gr-audio-alsa/src/audio_alsa.i])
 
+    AC_CONFIG_FILES([ \
+	gr-audio-alsa/Makefile \
+	gr-audio-alsa/src/Makefile \
+	gr-audio-alsa/src/run_tests \
+    ])
+
     succeeded=yes
     PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],[succeeded=no])
     if test $succeeded = yes; then
         LIBS="$LIBS $ALSA_LIBS"
 
-        AC_CONFIG_FILES([\
-	  gr-audio-alsa/Makefile \
-	  gr-audio-alsa/src/Makefile \
-	  gr-audio-alsa/src/run_tests \
-	])
-
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_alsa], [chmod +x gr-audio-alsa/src/run_tests])
         subdirs="$subdirs gr-audio-alsa"
diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4
index 3d4a00dae..0aa44e063 100644
--- a/config/grc_gr_audio_jack.m4
+++ b/config/grc_gr_audio_jack.m4
@@ -20,17 +20,17 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_AUDIO_JACK],[
     AC_CONFIG_SRCDIR([gr-audio-jack/src/audio_jack.i])
 
+    AC_CONFIG_FILES([ \
+	gr-audio-jack/Makefile \
+        gr-audio-jack/src/Makefile \
+	gr-audio-jack/src/run_tests \
+    ])
+
     succeeded=yes
     PKG_CHECK_MODULES(JACK, jack >= 0.8,[],[succeeded=no])
     if test $succeeded = yes; then
         LIBS="$LIBS $JACK_LIBS"
 
-        AC_CONFIG_FILES([\
-          gr-audio-jack/Makefile \
-          gr-audio-jack/src/Makefile \
-	  gr-audio-jack/src/run_tests \
-	])
-
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x gr-audio-jack/src/run_tests])
         subdirs="$subdirs gr-audio-jack"
diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4
index b0190d687..17e0ffda3 100644
--- a/config/grc_gr_audio_oss.m4
+++ b/config/grc_gr_audio_oss.m4
@@ -20,21 +20,19 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_AUDIO_OSS],[
     AC_CONFIG_SRCDIR([gr-audio-oss/src/audio_oss.i])
 
+    AC_CONFIG_FILES([ \
+	gr-audio-oss/Makefile \
+	gr-audio-oss/src/Makefile \
+	gr-audio-oss/src/run_tests \
+    ])
+
     succeeded=yes
 
     dnl needed for NetBSD
     dnl FIXME: conditionalize on NetBSD platform
     dnl AC_HAVE_LIBRARY(ossaudio,[],[succeeded=no])
-
     AC_CHECK_HEADER(sys/soundcard.h,[],[succeeded=no])
     if test $succeeded = yes; then
-
-        AC_CONFIG_FILES([\
-	  gr-audio-oss/Makefile \
-	  gr-audio-oss/src/Makefile \
-	  gr-audio-oss/src/run_tests \
-	])
-
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_oss], [chmod +x gr-audio-oss/src/run_tests])
         subdirs="$subdirs gr-audio-oss"
diff --git a/config/grc_gr_audio_osx.m4 b/config/grc_gr_audio_osx.m4
index becc1c48c..0f45ff625 100644
--- a/config/grc_gr_audio_osx.m4
+++ b/config/grc_gr_audio_osx.m4
@@ -20,13 +20,14 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_AUDIO_OSX],[
     AC_CONFIG_SRCDIR([gr-audio-osx/src/audio_osx.i])
 
-    succeeded=yes
-    MACOSX_AUDIOUNIT([],[succeeded=no])
-    AC_CONFIG_FILES([\
- 	gr-audio-osx/Makefile \
+    AC_CONFIG_FILES([ \
+	gr-audio-osx/Makefile \
 	gr-audio-osx/src/Makefile \
 	gr-audio-osx/src/run_tests \
-	])
+    ])
+    
+    succeeded=yes
+    MACOSX_AUDIOUNIT([],[succeeded=no])
     if test $succeeded = yes; then
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_osx], [chmod +x gr-audio-osx/src/run_tests])
diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4
index 193e2e313..a46146604 100644
--- a/config/grc_gr_audio_portaudio.m4
+++ b/config/grc_gr_audio_portaudio.m4
@@ -20,17 +20,17 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[
     AC_CONFIG_SRCDIR([gr-audio-portaudio/src/audio_portaudio.i])
 
+    AC_CONFIG_FILES([ \
+	gr-audio-portaudio/Makefile \
+	gr-audio-portaudio/src/Makefile \
+	gr-audio-portaudio/src/run_tests \
+    ])
+
     succeeded=yes
     PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],[succeeded=no])
     #AC_HAVE_LIBRARY([portaudio], [], [succeeded=no])
     #AC_CHECK_HEADER([portaudio.h], [], [succeeded=no])
     if test $succeeded = yes; then
-        AC_CONFIG_FILES([\
-	  gr-audio-portaudio/Makefile \
-	  gr-audio-portaudio/src/Makefile \
-	  gr-audio-portaudio/src/run_tests \
-	])
-
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_portaudio], [chmod +x gr-audio-portaudio/src/run_tests])
         subdirs="$subdirs gr-audio-portaudio"
diff --git a/config/grc_gr_audio_windows.m4 b/config/grc_gr_audio_windows.m4
index 6bcdd63bb..5c66b3360 100644
--- a/config/grc_gr_audio_windows.m4
+++ b/config/grc_gr_audio_windows.m4
@@ -20,16 +20,16 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[
     AC_CONFIG_SRCDIR([gr-audio-windows/src/audio_windows.i])
 
+    AC_CONFIG_FILES([ \
+	gr-audio-windows/Makefile \
+	gr-audio-windows/src/Makefile \
+	gr-audio-windows/src/run_tests \
+    ])
+
     succeeded=yes
     AC_HAVE_LIBRARY(winmm,[],[succeeded=no])
 
     if test $succeeded = yes; then
-        AC_CONFIG_FILES([\
-	  gr-audio-windows/Makefile \
-	  gr-audio-windows/src/Makefile \
-	  gr-audio-windows/src/run_tests \
-	])
-
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_windows], [chmod +x gr-audio-windows/src/run_tests])
         subdirs="$subdirs gr-audio-windows"
diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4
index eb996d14d..0800bdec6 100644
--- a/config/grc_gr_comedi.m4
+++ b/config/grc_gr_comedi.m4
@@ -20,17 +20,17 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_COMEDI],[
     AC_CONFIG_SRCDIR([gr-comedi/src/comedi.i])
 
+    AC_CONFIG_FILES([ \
+	gr-comedi/Makefile \
+	gr-comedi/src/Makefile \
+	gr-comedi/src/run_tests \
+    ])
+
     succeeded=yes
     PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[],[succeeded=no])
     if test $succeeded = yes; then
         LIBS="$LIBS $COMEDI_LIBS"
 
-        AC_CONFIG_FILES([\
-	  gr-comedi/Makefile \
-	  gr-comedi/src/Makefile \
-	  gr-comedi/src/run_tests \
-	])
-
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_comedi], [chmod +x gr-comedi/src/run_tests])
         subdirs="$subdirs gr-comedi"
diff --git a/config/grc_gr_usrp.m4 b/config/grc_gr_usrp.m4
index 2231905de..13aa2cb4d 100644
--- a/config/grc_gr_usrp.m4
+++ b/config/grc_gr_usrp.m4
@@ -20,6 +20,12 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_USRP],[
     AC_CONFIG_SRCDIR([gr-usrp/src/usrp1.i])
 
+    AC_CONFIG_FILES([ \
+	 gr-usrp/Makefile \
+	 gr-usrp/src/Makefile \
+	 gr-usrp/src/run_tests \
+    ])
+
     # Don't do gr-usrp if usrp failed
     # There *has* to be a better way to check if a value is in a string
     succeeded=yes
@@ -31,15 +37,8 @@ AC_DEFUN([GRC_GR_USRP],[
     done
 
     if test $succeeded = yes; then
-	AC_CONFIG_FILES([\
-	  gr-usrp/Makefile \
-	  gr-usrp/src/Makefile \
-	  gr-usrp/src/run_tests \
-	])
-
 	dnl run_tests is created from run_tests.in.  Make it executable.
 	AC_CONFIG_COMMANDS([run_tests_usrp], [chmod +x gr-usrp/src/run_tests])
-
 	subdirs="$subdirs gr-usrp"
     else
 	failed="$failed gr-usrp"
diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4
index 1432ccd67..c161b5f3e 100644
--- a/config/grc_gr_video_sdl.m4
+++ b/config/grc_gr_video_sdl.m4
@@ -20,8 +20,13 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_GR_VIDEO_SDL],[
     AC_CONFIG_SRCDIR([gr-video-sdl/src/video_sdl.i])
 
+    AC_CONFIG_FILES([ \
+	gr-video-sdl/Makefile \
+	gr-video-sdl/src/Makefile \
+	gr-video-sdl/src/run_tests \
+    ])
+    
     succeeded=yes
-
     dnl Check for SDL
     SDL_VERSION=1.2.0
     AM_PATH_SDL($SDL_VERSION,[],[succeeded=no])
@@ -29,13 +34,6 @@ AC_DEFUN([GRC_GR_VIDEO_SDL],[
     if test $succeeded = yes; then
         AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS"
         AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS"
-
-        AC_CONFIG_FILES([\
-	  gr-video-sdl/Makefile \
-	  gr-video-sdl/src/Makefile \
-	  gr-video-sdl/src/run_tests \
-	])
-
 	dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_sdl], [chmod +x gr-video-sdl/src/run_tests])
         subdirs="$subdirs gr-video-sdl"
diff --git a/config/grc_usrp.m4 b/config/grc_usrp.m4
index be75387ec..85e7f31fe 100644
--- a/config/grc_usrp.m4
+++ b/config/grc_usrp.m4
@@ -20,6 +20,29 @@ dnl Boston, MA 02111-1307, USA.
 AC_DEFUN([GRC_USRP],[
     AC_CONFIG_SRCDIR([usrp/host/lib/usrp_prims.h])
 
+    AC_CONFIG_FILES([ \
+	usrp/Makefile				\
+	usrp/usrp.pc 				\
+	usrp/usrp.iss				\
+	usrp/doc/Doxyfile			\
+	usrp/doc/Makefile			\
+	usrp/doc/other/Makefile			\
+	usrp/host/Makefile			\
+	usrp/host/misc/Makefile			\
+	usrp/host/lib/Makefile			\
+	usrp/host/lib/std_paths.h		\
+	usrp/host/swig/Makefile			\
+	usrp/host/apps/Makefile			\
+	usrp/firmware/Makefile			\
+	usrp/firmware/include/Makefile		\
+	usrp/firmware/lib/Makefile		\
+	usrp/firmware/src/Makefile 		\
+	usrp/firmware/src/common/Makefile 	\
+	usrp/firmware/src/usrp2/Makefile 	\
+	usrp/fpga/Makefile			\
+	usrp/fpga/rbf/Makefile			\
+    ])
+
     AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
     AM_CONDITIONAL(HAS_XMLTO, test x$XMLTO = xyes)
 
@@ -54,29 +77,6 @@ AC_DEFUN([GRC_USRP],[
         DEFINES="$USRP_DEFINES"
         AC_SUBST(DEFINES)
 
-        AC_CONFIG_FILES([ \
-	  usrp/Makefile				\
-	  usrp/usrp.pc 				\
-	  usrp/usrp.iss				\
-	  usrp/doc/Doxyfile			\
-	  usrp/doc/Makefile			\
-	  usrp/doc/other/Makefile		\
-	  usrp/host/Makefile			\
-	  usrp/host/misc/Makefile		\
-	  usrp/host/lib/Makefile		\
-	  usrp/host/lib/std_paths.h		\
-	  usrp/host/swig/Makefile		\
-	  usrp/host/apps/Makefile		\
-	  usrp/firmware/Makefile		\
-	  usrp/firmware/include/Makefile	\
-	  usrp/firmware/lib/Makefile		\
-	  usrp/firmware/src/Makefile 		\
-	  usrp/firmware/src/common/Makefile 	\
-	  usrp/firmware/src/usrp2/Makefile 	\
-	  usrp/fpga/Makefile			\
-	  usrp/fpga/rbf/Makefile		\
-	])
-    
 	subdirs="$subdirs usrp"
     else
 	failed="$failed usrp"