diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-29 04:00:13 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-29 04:00:13 +0000 |
| commit | 90e4faa68bbb21a21a459755942756686985ba46 (patch) | |
| tree | a6eec2a8e877a0d9aa5000a1dfb069cc772c8312 /config/grc_gr_video_sdl.m4 | |
| parent | c7da4a90c594001596ab869cfa4bfb2479c9ac6d (diff) | |
Merged r7769:7873 from michaelld/bc_behavior into trunk.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7888 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config/grc_gr_video_sdl.m4')
| -rw-r--r-- | config/grc_gr_video_sdl.m4 | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4 index 74aa5c046c..774f7250c8 100644 --- a/config/grc_gr_video_sdl.m4 +++ b/config/grc_gr_video_sdl.m4 @@ -20,26 +20,28 @@ dnl Boston, MA 02110-1301, USA. AC_DEFUN([GRC_GR_VIDEO_SDL],[ GRC_ENABLE([gr-video-sdl]) + dnl Don't do gr-video-sdl if gnuradio-core skipped + GRC_CHECK_DEPENDENCY(gr-video-sdl, gnuradio-core) + + dnl If execution gets to here, $passed will be: + dnl with : if the --with code didn't error out + dnl yes : if the --enable code passed muster and all dependencies are met + dnl no : otherwise + if test $passed = yes; then + dnl Don't do gr-video-sdl if the SDL library is unavailable. + PKG_CHECK_MODULES(SDL, sdl >= 1.2.0, [], + [SDL_VERSION=1.2.0 + AM_PATH_SDL($SDL_VERSION, [], [ + passed=no;AC_MSG_RESULT([gr-video-sdl requires library sdl, not found or failed test.])])]) + fi + AC_CONFIG_FILES([ \ - gr-video-sdl/Makefile \ - gr-video-sdl/src/Makefile \ - gr-video-sdl/src/run_tests \ + gr-video-sdl/Makefile \ + gr-video-sdl/src/Makefile \ + gr-video-sdl/src/run_tests \ ]) - - passed=yes - # Don't do gr-video-sdl if gnuradio-core skipped - if test x$gnuradio_core_skipped = xyes; then - AC_MSG_RESULT([Component gr-video-sdl requires gnuradio-core, which is not being built or specified via pre-installed files.]) - passed=no - fi - # Don't do gr-video-sdl if the SDL library is unavailable. - SDL_VERSION=1.2.0 - AM_PATH_SDL($SDL_VERSION,[], - [passed=no;AC_MSG_RESULT([gr-video-sdl requires library sdl, not found or failed test.])]) - GRC_BUILD_CONDITIONAL([gr-video-sdl],[ - AC_SUBST(SDL_CFLAGS) - AC_SUBST(SDL_LIBS) + GRC_BUILD_CONDITIONAL(gr-video-sdl,[ 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]) ]) |