Merged eb/omni -r4315:4327 into trunk.

Extracted omnithread from gnuradio-core and made it a top-level
component.  This allows mblock to use it without a dependency on
gnuradio-core.  Completes ticket:132


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

3 files changed, 54 insertions, 2 deletions

diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index da91f61ee..6b9c8542e 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.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,2007 Free Software Foundation, Inc.
 dnl 
 dnl This file is part of GNU Radio
 dnl 
@@ -37,7 +37,6 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
         gnuradio-core/src/lib/gengen/Makefile \
         gnuradio-core/src/lib/io/Makefile \
         gnuradio-core/src/lib/missing/Makefile \
-        gnuradio-core/src/lib/omnithread/Makefile \
         gnuradio-core/src/lib/reed-solomon/Makefile \
         gnuradio-core/src/lib/runtime/Makefile \
         gnuradio-core/src/lib/swig/Makefile \
@@ -55,6 +54,16 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
     ])
     
     passed=yes
+    # Don't do gnuradio-core if omnithread skipped
+    # There *has* to be a better way to check if a value is in a string
+    for dir in $skipped_dirs
+    do
+	if test x$dir = xomnithread; then
+	    AC_MSG_RESULT([Component gnuradio-core requires omnithread, which is not being built.])
+	    passed=no
+	fi
+    done
+
     GRC_BUILD_CONDITIONAL([gnuradio-core],[
         dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_core], [chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests])
diff --git a/config/grc_mblock.m4 b/config/grc_mblock.m4
index a8fba4e03..6e4bc4afe 100644
--- a/config/grc_mblock.m4
+++ b/config/grc_mblock.m4
@@ -28,6 +28,16 @@ AC_DEFUN([GRC_MBLOCK],[
     ])
 
     passed=yes
+    # Don't do mblock if omnithread skipped
+    # There *has* to be a better way to check if a value is in a string
+    for dir in $skipped_dirs
+    do
+	if test x$dir = xomnithread; then
+	    AC_MSG_RESULT([Component mblock requires omnithread, which is not being built.])
+	    passed=no
+	fi
+    done
+
     # Don't do mblock if pmt skipped
     # There *has* to be a better way to check if a value is in a string
     for dir in $skipped_dirs
diff --git a/config/grc_omnithread.m4 b/config/grc_omnithread.m4
new file mode 100644
index 000000000..627ccdc9d
--- /dev/null
+++ b/config/grc_omnithread.m4
@@ -0,0 +1,33 @@
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007 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 2, 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_OMNITHREAD],[
+    GRC_ENABLE([omnithread])
+
+    AC_CONFIG_FILES([ \
+        omnithread/Makefile \
+    ])
+    
+    passed=yes
+    GRC_BUILD_CONDITIONAL([omnithread],[
+        dnl run_tests is created from run_tests.in.  Make it executable.
+	dnl AC_CONFIG_COMMANDS([run_tests_omnithread], [chmod +x omnithread/run_tests])
+
+    ])
+])