[Commit-gnuradio] r4331 - in gnuradio/branches/developers/eb/ticket-134: . config omnithread

[eb]

Author: eb
Date: 2007-01-29 19:51:37 -0700 (Mon, 29 Jan 2007)
New Revision: 4331

Modified:
   gnuradio/branches/developers/eb/ticket-134/config/gr_omnithread.m4
   gnuradio/branches/developers/eb/ticket-134/configure.ac
   gnuradio/branches/developers/eb/ticket-134/omnithread/omnithread.h
Log:
trial fix for ticket:134

Modified: gnuradio/branches/developers/eb/ticket-134/config/gr_omnithread.m4
===================================================================
--- gnuradio/branches/developers/eb/ticket-134/config/gr_omnithread.m4  
2007-01-30 02:30:20 UTC (rev 4330)
+++ gnuradio/branches/developers/eb/ticket-134/config/gr_omnithread.m4  
2007-01-30 02:51:37 UTC (rev 4331)
@@ -22,7 +22,7 @@
   # Check first for POSIX
   ACX_PTHREAD(
   [ ot_posix="yes"
-    AC_DEFINE(OMNITHREAD_POSIX,[1],[Define to 1 to enable pthread])
+    DEFINES="$DEFINES -DOMNITHREAD_POSIX=1"
   ],[
     # If no POSIX support found, then check for NT threads
     AC_MSG_CHECKING([for NT threads])
@@ -34,7 +34,7 @@
       ],
       [ 
         ot_nt="yes"
-       AC_DEFINE(OMNITHREAD_NT,[1],[Define to 1 to enable NT thread])
+        DEFINES="$DEFINES -DOMNITHREAD_NT=1"
       ],
       [AC_MSG_FAILURE([GNU Radio requires POSIX threads.  pthreads not 
found.])]
     )

Modified: gnuradio/branches/developers/eb/ticket-134/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/ticket-134/configure.ac     2007-01-30 
02:30:20 UTC (rev 4330)
+++ gnuradio/branches/developers/eb/ticket-134/configure.ac     2007-01-30 
02:51:37 UTC (rev 4331)
@@ -25,6 +25,9 @@
 AM_INIT_AUTOMAKE(gnuradio,3.0svn)
 AC_CONFIG_SRCDIR([gnuradio-core/src/lib/runtime/gr_vmcircbuf.cc])
 
+DEFINES=""
+AC_SUBST(DEFINES)
+
 dnl Remember if the user explicity set CXXFLAGS
 if test -n "${CXXFLAGS}"; then
   user_set_cxxflags=yes
@@ -173,9 +176,6 @@
 dnl defines BOOST_CFLAGS
 GR_REQUIRE_BOOST_INCLUDES
 
-DEFINES=""
-AC_SUBST(DEFINES)
-
 dnl Component specific configuration
 dnl The order of the GR_ macros determines the order of compilation
 AC_ARG_ENABLE(

Modified: gnuradio/branches/developers/eb/ticket-134/omnithread/omnithread.h
===================================================================
--- gnuradio/branches/developers/eb/ticket-134/omnithread/omnithread.h  
2007-01-30 02:30:20 UTC (rev 4330)
+++ gnuradio/branches/developers/eb/ticket-134/omnithread/omnithread.h  
2007-01-30 02:51:37 UTC (rev 4331)
@@ -73,7 +73,7 @@
 //
 
 #if !defined(OMNITHREAD_POSIX) && !defined(OMNITHREAD_NT) && defined 
HAVE_CONFIG_H
-#include <config.h>
+// #include <config.h>      // No, No, No!  Never include <config.h> from a 
header
 #endif
 
 #if defined(OMNITHREAD_POSIX)