[Commit-gnuradio] r9371 - gnuradio/branches/developers/jblum/grc/config

[jblum]

Author: jblum
Date: 2008-08-22 13:03:02 -0600 (Fri, 22 Aug 2008)
New Revision: 9371

Modified:
   gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4
   gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
Log:
wxgui comp check

Modified: gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4       
2008-08-22 07:23:10 UTC (rev 9370)
+++ gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4       
2008-08-22 19:03:02 UTC (rev 9371)
@@ -30,10 +30,17 @@
     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-wxgui if wxPython is not available
         if ! ${PYTHON} -c 'import wx'; then
+            echo '*** WXGUI requirement "wx python" not found.'
             passed=no
         fi
+        if ! ${PYTHON} -c 'import numpy'; then
+            echo '*** WXGUI requirement "numpy" not found.'
+            passed=no
+        fi
+        if test $passed = no; then
+            echo '*** WXGUI will not be configured.'
+        fi
     fi
 
     AC_CONFIG_FILES([ \

Modified: gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2008-08-22 
07:23:10 UTC (rev 9370)
+++ gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2008-08-22 
19:03:02 UTC (rev 9371)
@@ -21,6 +21,7 @@
 
     GRC_ENABLE(grc)
 
+    GRC_CHECK_DEPENDENCY(grc, gr-wxgui)
     GRC_CHECK_DEPENDENCY(grc, gnuradio-core)
 
     dnl ########################################