[Commit-gnuradio] r9372 - in gnuradio/branches/developers/jblum/grc: config grc

[jcorgan]

Author: jcorgan
Date: 2008-08-22 17:09:53 -0600 (Fri, 22 Aug 2008)
New Revision: 9372

Removed:
   gnuradio/branches/developers/jblum/grc/grc/license/
   gnuradio/branches/developers/jblum/grc/grc/notes/
   gnuradio/branches/developers/jblum/grc/grc/readme.txt
Modified:
   gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4
   gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
Log:
Cleanup for merge, more to do

Modified: gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4       
2008-08-22 19:03:02 UTC (rev 9371)
+++ gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4       
2008-08-22 23:09:53 UTC (rev 9372)
@@ -19,7 +19,6 @@
 
 AC_DEFUN([GRC_GR_WXGUI],[
     GRC_ENABLE(gr-wxgui)
-
     GRC_WITH(gr-wxgui)
 
     dnl Don't do gr-wxgui if gnuradio-core skipped
@@ -31,16 +30,13 @@
     dnl   no   : otherwise
     if test $passed = yes; then
         if ! ${PYTHON} -c 'import wx'; then
-            echo '*** WXGUI requirement "wx python" not found.'
+           AC_MSG_RESULT([gr-wxgui requires wxPython, not found.])
             passed=no
         fi
         if ! ${PYTHON} -c 'import numpy'; then
-            echo '*** WXGUI requirement "numpy" not found.'
+           AC_MSG_RESULT([gr-wxgui requires numpy (Numeric Python), 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 
19:03:02 UTC (rev 9371)
+++ gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2008-08-22 
23:09:53 UTC (rev 9372)
@@ -18,41 +18,33 @@
 dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GRC],[
-
     GRC_ENABLE(grc)
 
     GRC_CHECK_DEPENDENCY(grc, gr-wxgui)
-    GRC_CHECK_DEPENDENCY(grc, gnuradio-core)
 
     dnl ########################################
     dnl # test python dependencies
     dnl ########################################
     if test $passed = yes; then
-        if ! ${PYTHON} -c 'import numpy'; then
-            echo '*** GRC requirement "numpy" not found.'
-            passed=no
-        fi
         if ! ${PYTHON} -c 'import Cheetah'; then
-            echo '*** GRC requirement "Cheetah Templates" not found.'
+            AC_MSG_RESULT([grc requires the Python Cheetah templates 
installed, not found.])
             passed=no
         fi
         if ! ${PYTHON} -c 'import pygtk'; then
-            echo '*** GRC requirement "pygtk" not found.'
+            AC_MSG_RESULT([grc requires Python GTK wrappers installed, not 
found.])
             passed=no
         fi
         if ! ${PYTHON} -c 'import lxml'; then
-            echo '*** GRC requirement "lxml" not found.'
+            AC_MSG_RESULT([grc requires libxml2 and libxslt wrappers (lxml), 
not found.])
             passed=no
         fi
-        if test $passed = no; then
-            echo '*** GRC will not be configured.'
-        fi
     fi
 
     dnl ########################################
     dnl # platform dependency pythonw
     dnl ########################################
-    if test `python -c "import sys; print sys.platform"` = 'darwin'; then
+    dnl FIXME: move this test to Python config m4
+    if test `${PYTHON} -c "import sys; print sys.platform"` = 'darwin'; then
         PYTHONW=pythonw
     else
         PYTHONW=python
@@ -60,22 +52,22 @@
     AC_SUBST(PYTHONW)
 
     AC_CONFIG_FILES([ \
-        grc/src/grc/gui/elements/Makefile \
+        grc/Makefile \
+        grc/data/Makefile \
+        grc/data/grc/Makefile \
+        grc/data/grc_gnuradio/Makefile \
+        grc/data/grc_gnuradio/blocks/Makefile \
+        grc/src/Makefile \
+        grc/src/grc/Makefile \
         grc/src/grc/gui/Makefile \
+        grc/src/grc/gui/elements/Makefile \
         grc/src/grc/elements/Makefile \
-        grc/src/grc/Makefile \
-        grc/src/grc_gnuradio/usrp/Makefile \
+        grc/src/grc_gnuradio/Makefile \
         grc/src/grc_gnuradio/blks2/Makefile \
+        grc/src/grc_gnuradio/usrp/Makefile \
         grc/src/grc_gnuradio/utils/Makefile \
         grc/src/grc_gnuradio/wxgui/Makefile \
-        grc/src/grc_gnuradio/Makefile \
-        grc/src/Makefile \
-        grc/data/grc/Makefile \
-        grc/data/Makefile \
-        grc/data/grc_gnuradio/blocks/Makefile \
-        grc/data/grc_gnuradio/Makefile \
         grc/scripts/Makefile \
-        grc/Makefile \
     ])
 
     GRC_BUILD_CONDITIONAL(grc)

Deleted: gnuradio/branches/developers/jblum/grc/grc/readme.txt