diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2006-08-07 15:41:19 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2006-08-07 15:41:19 +0000 |
| commit | e27ba9aebfddf88cd245636d2f652a4ee4e289ec (patch) | |
| tree | 01f44251578419823c34f140ee58d8fc6016a1c2 /config | |
| parent | 37bee553f670da9c82b5a438fe06df3a1ca8b2aa (diff) | |
Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from
/gnuradio/branches/developers/jcorgan/ticket-10. 'make distcheck' now
successfully completes on a machine that has never had gnuradio installed
before. In addition, several cleanups and refactoring of build system
code have been applied. NOTE: gr-audio-portaudio, gr-audio-osx, and
gr-audio-windows have not been fully tested and will need verification
by the maintainers of these components.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3216 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_gr_audio_alsa.m4 | 2 | ||||
| -rw-r--r-- | config/grc_gr_audio_jack.m4 | 2 | ||||
| -rw-r--r-- | config/grc_gr_audio_portaudio.m4 | 4 | ||||
| -rw-r--r-- | config/grc_gr_audio_windows.m4 | 3 | ||||
| -rw-r--r-- | config/grc_gr_comedi.m4 | 2 | ||||
| -rw-r--r-- | config/grc_gr_video_sdl.m4 | 7 | ||||
| -rw-r--r-- | config/grc_gr_wxgui.m4 | 4 | ||||
| -rw-r--r-- | config/grc_pmt.m4 (renamed from config/grc_gr_pmt.m4) | 2 |
8 files changed, 17 insertions, 9 deletions
diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4 index c1d88b9e43..32b1e16b59 100644 --- a/config/grc_gr_audio_alsa.m4 +++ b/config/grc_gr_audio_alsa.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[ succeeded=yes PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],[succeeded=no]) if test $succeeded = yes; then - LIBS="$LIBS $ALSA_LIBS" + AC_SUBST(ALSA_LIBS) 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]) diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4 index 0aa44e063e..d84313097e 100644 --- a/config/grc_gr_audio_jack.m4 +++ b/config/grc_gr_audio_jack.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_AUDIO_JACK],[ succeeded=yes PKG_CHECK_MODULES(JACK, jack >= 0.8,[],[succeeded=no]) if test $succeeded = yes; then - LIBS="$LIBS $JACK_LIBS" + AC_SUBST(JACK_LIBS) 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]) diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4 index a461466041..19dfaa2a96 100644 --- a/config/grc_gr_audio_portaudio.m4 +++ b/config/grc_gr_audio_portaudio.m4 @@ -28,9 +28,9 @@ AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[ 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_SUBST(PORTAUDIO_LIBS) 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 5c66b33608..64d482e814 100644 --- a/config/grc_gr_audio_windows.m4 +++ b/config/grc_gr_audio_windows.m4 @@ -30,6 +30,9 @@ AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[ AC_HAVE_LIBRARY(winmm,[],[succeeded=no]) if test $succeeded = yes; then + WINAUDIO_LIBS=-lwinmm + AC_SUBST(WINAUDIO_LIBS) + 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 0800bdec63..22e98cd646 100644 --- a/config/grc_gr_comedi.m4 +++ b/config/grc_gr_comedi.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[ succeeded=yes PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[],[succeeded=no]) if test $succeeded = yes; then - LIBS="$LIBS $COMEDI_LIBS" + AC_SUBST(COMEDI_LIBS) 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]) diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4 index c161b5f3e8..b0ca943494 100644 --- a/config/grc_gr_video_sdl.m4 +++ b/config/grc_gr_video_sdl.m4 @@ -32,8 +32,11 @@ AC_DEFUN([GRC_GR_VIDEO_SDL],[ AM_PATH_SDL($SDL_VERSION,[],[succeeded=no]) if test $succeeded = yes; then - AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS" - AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS" + #AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS" + #AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS" + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + 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_gr_wxgui.m4 b/config/grc_gr_wxgui.m4 index 8f3c8f8ee9..2713f9b080 100644 --- a/config/grc_gr_wxgui.m4 +++ b/config/grc_gr_wxgui.m4 @@ -22,7 +22,9 @@ AC_DEFUN([GRC_GR_WXGUI],[ # FIXME: Should we actually check for wxPython, even though # this is a runtime requirement, not a compile/install time one? - + # + # This is logged as ticket 17 + AC_CONFIG_FILES([ \ gr-wxgui/Makefile \ gr-wxgui/src/Makefile \ diff --git a/config/grc_gr_pmt.m4 b/config/grc_pmt.m4 index 951d640566..7484b74537 100644 --- a/config/grc_gr_pmt.m4 +++ b/config/grc_pmt.m4 @@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING. If not, write to dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, dnl Boston, MA 02111-1307, USA. -AC_DEFUN([GRC_GR_PMT],[ +AC_DEFUN([GRC_PMT],[ AC_CONFIG_SRCDIR([pmt/src/lib/pmt.h]) AC_CONFIG_FILES([\ |