Merged changeset r9285:9377 from jblum/grc into trunk, with distcheck fixes

and local modifications.

Integrates previously separate GNU Radio Companion into top-level component
'grc'.  (Josh Blum)


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9378 221aa14e-8319-0410-a670-987f0aec2ac5

4 files changed, 88 insertions, 11 deletions

diff --git a/config/Makefile.am b/config/Makefile.am
index cc58d96c1..b02969013 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -47,6 +47,7 @@ m4macros = \
 	grc_gcell.m4 \
 	grc_gnuradio_core.m4 \
 	grc_gnuradio_examples.m4 \
+	grc_grc.m4 \
 	grc_gr_atsc.m4 \
 	grc_gr_audio_alsa.m4 \
 	grc_gr_audio_jack.m4 \
diff --git a/config/gr_doxygen.m4 b/config/gr_doxygen.m4
index 43433098d..15ece8b12 100644
--- a/config/gr_doxygen.m4
+++ b/config/gr_doxygen.m4
@@ -24,13 +24,6 @@ AC_DEFUN([GR_CHECK_DOXYGEN],[
 		AC_HELP_STRING([--enable-doxygen],
 			       [enable documentation generation with doxygen (no)]))
   AC_ARG_ENABLE(dot, AC_HELP_STRING([--enable-dot],[use 'dot' to generate graphs in doxygen (auto)]))
-  AC_ARG_ENABLE(html-docs,
-                AC_HELP_STRING([--enable-html-docs],[enable HTML generation with doxygen (yes)]),
-                [], [ enable_html_docs=yes])
-  AC_ARG_ENABLE(latex-docs,
-                AC_HELP_STRING([--enable-latex-docs],
-			       [enable LaTeX doc generation with doxygen (no)]),
-                [], [ enable_latex_docs=no])
 
   if test "x$enable_doxygen" = xyes; then
         AC_PATH_PROG(DOXYGEN, doxygen, , $PATH)
@@ -60,7 +53,8 @@ AC_DEFUN([GR_CHECK_DOXYGEN],[
         enable_dot=yes
   fi
   AC_SUBST(enable_dot)
-  AC_SUBST(enable_html_docs)
-  AC_SUBST(enable_latex_docs)
+  AC_SUBST(enable_xml_docs, YES)
+  AC_SUBST(enable_html_docs, YES)
+  AC_SUBST(enable_latex_docs, NO)
   AC_SUBST(generate_docs)
 ])
diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4
index e1a3fe4c9..476c431d2 100644
--- a/config/grc_gr_wxgui.m4
+++ b/config/grc_gr_wxgui.m4
@@ -19,7 +19,6 @@ dnl Boston, MA 02110-1301, USA.
 
 AC_DEFUN([GRC_GR_WXGUI],[
     GRC_ENABLE(gr-wxgui)
-
     GRC_WITH(gr-wxgui)
 
     dnl Don't do gr-wxgui if gnuradio-core skipped
@@ -30,8 +29,12 @@ AC_DEFUN([GRC_GR_WXGUI],[
     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
+            AC_MSG_RESULT([gr-wxgui requires wxPython, not found.])
+            passed=no
+        fi
+        if ! ${PYTHON} -c 'import numpy'; then
+            AC_MSG_RESULT([gr-wxgui requires numpy (Numeric Python), not found.])
             passed=no
         fi
     fi
diff --git a/config/grc_grc.m4 b/config/grc_grc.m4
new file mode 100644
index 000000000..e2b63f515
--- /dev/null
+++ b/config/grc_grc.m4
@@ -0,0 +1,79 @@
+dnl Copyright 2008 Free Software Foundation, Inc.
+dnl
+dnl This file is part of GNU Radio
+dnl
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_GRC],[
+    GRC_ENABLE(grc)
+
+    GRC_CHECK_DEPENDENCY(grc, gr-wxgui)
+
+    dnl ########################################
+    dnl # test python dependencies
+    dnl ########################################
+    if test $passed = yes; then
+        if ! ${PYTHON} -c 'import Cheetah'; then
+            AC_MSG_RESULT([grc requires the Python Cheetah templates installed, not found.])
+            passed=no
+        fi
+        if ! ${PYTHON} -c 'import pygtk'; then
+            AC_MSG_RESULT([grc requires Python GTK wrappers installed, not found.])
+            passed=no
+        fi
+        if ! ${PYTHON} -c 'import lxml'; then
+            AC_MSG_RESULT([grc requires libxml2 and libxslt wrappers (lxml), not found.])
+            passed=no
+        fi
+    fi
+
+    dnl ########################################
+    dnl # platform dependency pythonw
+    dnl ########################################
+    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
+    fi
+    AC_SUBST(PYTHONW)
+
+    AC_CONFIG_FILES([ \
+        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_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/scripts/Makefile \
+        grc/examples/Makefile \
+        grc/examples/audio/Makefile \
+        grc/examples/simple/Makefile \
+        grc/examples/usrp/Makefile \
+        grc/examples/xmlrpc/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(grc)
+])