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

[jcorgan]

Author: jcorgan
Date: 2006-08-23 23:20:31 -0600 (Wed, 23 Aug 2006)
New Revision: 3399

Modified:
   gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_wxgui.m4
   gnuradio/branches/developers/jcorgan/ticket-28/configure.ac
Log:
Implements ticket:28 for gr-wxgui.

Modified: gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_wxgui.m4       
2006-08-24 05:16:27 UTC (rev 3398)
+++ gnuradio/branches/developers/jcorgan/ticket-28/config/grc_gr_wxgui.m4       
2006-08-24 05:20:31 UTC (rev 3399)
@@ -18,7 +18,7 @@
 dnl Boston, MA 02111-1307, USA.
 
 AC_DEFUN([GRC_GR_WXGUI],[
-    AC_CONFIG_SRCDIR([gr-wxgui/src/python/stdgui.py])
+    GRC_ENABLE([gr-wxgui])
 
     AC_CONFIG_FILES([ \
          gr-wxgui/Makefile \
@@ -26,9 +26,13 @@
          gr-wxgui/src/python/Makefile \
     ])
 
+    # FIXME: this breaks pkgsrc by calling python without a version number
+    # gdt--patch welcome :-)
     if python -c 'import wx'; then
-       subdirs="$subdirs gr-wxgui"
+       passed=yes
     else
-       failed="$failed gr-wxgui"
+       passed=no
     fi
+    
+    GRC_BUILD_CONDITIONAL([gr-wxgui])
 ])

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