X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=config%2Fgrc_gr_wxgui.m4;h=c443f7c6c2f3826631a00458a989fed29c633c0e;hb=refs%2Ftags%2Fupstream%2F3.2.2;hp=22f0a90e28b52903d2b72d87b3e8b124599f240a;hpb=09a1e803a9e6587c78d20cdf16891e5295874668;p=debian%2Fgnuradio

diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4
index 22f0a90e..c443f7c6 100644
--- a/config/grc_gr_wxgui.m4
+++ b/config/grc_gr_wxgui.m4
@@ -1,4 +1,4 @@
-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 
@@ -18,19 +18,28 @@ dnl the Free Software Foundation, Inc., 51 Franklin Street,
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_WXGUI],[
-    GRC_ENABLE([gr-wxgui])
+    GRC_ENABLE(gr-wxgui)
+    GRC_WITH(gr-wxgui)
+
+    dnl Don't do gr-wxgui if gnuradio-core skipped
+    GRC_CHECK_DEPENDENCY(gr-wxgui, 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
+        PYTHON_CHECK_MODULE([wx],[Python wxWidgets wrappers >= 2.8],[],[passed=no],[wx.version().split()[[0]] >= "2.8"])
+        PYTHON_CHECK_MODULE([numpy],[Numeric Python extensions],[],[passed=no])
+    fi
 
     AC_CONFIG_FILES([ \
-	  gr-wxgui/Makefile \
-	  gr-wxgui/src/Makefile \
-	  gr-wxgui/src/python/Makefile \
+        gr-wxgui/Makefile \
+        gr-wxgui/gr-wxgui.pc \
+        gr-wxgui/src/Makefile \
+        gr-wxgui/src/python/Makefile \
+        gr-wxgui/src/python/plotter/Makefile \
     ])
 
-    if ${PYTHON} -c 'import wx'; then
-	passed=yes
-    else
-	passed=no
-    fi
-    
-    GRC_BUILD_CONDITIONAL([gr-wxgui])
+    GRC_BUILD_CONDITIONAL(gr-wxgui)
 ])