X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_video_sdl.m4;h=774f7250c8b0d69dae57c9af69363b24283174d3;hb=ea29b08aeb54227e6628f655ccfdb96fe4d8c378;hp=5261533166579a6a75cd925f3441c34d22ba2cdc;hpb=0cfd4875e519e2b1ee05d074f72ec67391ed13bf;p=debian%2Fgnuradio

diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4
index 52615331..774f7250 100644
--- a/config/grc_gr_video_sdl.m4
+++ b/config/grc_gr_video_sdl.m4
@@ -1,10 +1,10 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
 dnl GNU Radio is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
+dnl the Free Software Foundation; either version 3, or (at your option)
 dnl any later version.
 dnl 
 dnl GNU Radio is distributed in the hope that it will be useful,
@@ -20,20 +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
-    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])
     ])