Fix missing files in distribution tarball (Dan Halperin).

[debian/gnuradio] / config / grc_gr_video_sdl.m4

diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4
index f764b0b58fec5dec20280046ce60e3e044e3a0f5..74aa5c046c9b7f2e09b1114c2f348db923d6e4f7 100644 (file)
--- 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,
@@ -14,8 +14,8 @@ dnl GNU General Public License for more details.
 dnl 
 dnl You should have received a copy of the GNU General Public License
 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.
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_VIDEO_SDL],[
     GRC_ENABLE([gr-video-sdl])
@@ -27,9 +27,15 @@ AC_DEFUN([GRC_GR_VIDEO_SDL],[
     ])
     
     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.])])
+        [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)