[Commit-gnuradio] r3398 - in gnuradio/branches/developers/jcorgan/ticket-28: . config

[jcorgan]

Author: jcorgan
Date: 2006-08-23 23:16:27 -0600 (Wed, 23 Aug 2006)
New Revision: 3398

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_video_sdl.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implements ticket:28 for gr-video-sdl.

Modified: 
gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_video_sdl.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_video_sdl.m4   
2006-08-24 05:10:23 UTC (rev 3397)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_video_sdl.m4   
2006-08-24 05:16:27 UTC (rev 3398)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_VIDEO_SDL],[
-    AC_CONFIG_SRCDIR([gr-video-sdl/src/video_sdl.i])
+    GRC_ENABLE([gr-video-sdl])
 
     AC_CONFIG_FILES([ \
        gr-video-sdl/Makefile \
@@ -26,21 +26,15 @@
        gr-video-sdl/src/run_tests \
     ])
     
-    succeeded=yes
-    dnl Check for SDL
+    passed=yes
     SDL_VERSION=1.2.0
-    AM_PATH_SDL($SDL_VERSION,[],[succeeded=no])
+    AM_PATH_SDL($SDL_VERSION,[],
+        [passed=no;AC_MSG_RESULT([gr-video-sdl requires library sdl, not 
found.])])
 
-    if test $succeeded = yes; then
-        #AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS"
-        #AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS"
+    GRC_BUILD_CONDITIONAL([gr-video-sdl],[
        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"
-    else
-       failed="$failed gr-video-sdl"
-    fi
+    ])
 ])

Modified: gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
05:10:23 UTC (rev 3397)
+++ gnuradio/branches/developers/jcorgan/ticket-28/configure.ac 2006-08-24 
05:16:27 UTC (rev 3398)
@@ -172,7 +172,7 @@
 GRC_GR_GSM_FR_VOCODER
 GRC_GR_RADAR
 GRC_GR_RADIO_ASTRONOMY
-#GRC_GR_VIDEO_SDL
+GRC_GR_VIDEO_SDL
 #GRC_GR_WXGUI
 #GRC_PMT
 #GRC_MBLOCK                    dnl this must come after GRC_PMT