commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r8904 - gnuradio/branches/developers/eb/sched-wip/conf


From: eb
Subject: [Commit-gnuradio] r8904 - gnuradio/branches/developers/eb/sched-wip/config
Date: Wed, 16 Jul 2008 13:26:30 -0600 (MDT)

Author: eb
Date: 2008-07-16 13:26:28 -0600 (Wed, 16 Jul 2008)
New Revision: 8904

Modified:
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_asio.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_date_time.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_filesystem.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_iostreams.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_program_options.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_python.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_regex.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_serialization.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_signals.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_system.m4
   
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_test_exec_monitor.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4
   
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_unit_test_framework.m4
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_wserialization.m4
Log:
mp-scheduler now cross-compiles correctly

Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_asio.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_asio.m4   
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_asio.m4   
2008-07-16 19:26:28 UTC (rev 8904)
@@ -81,6 +81,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_asio" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_ASIO,,[define if the Boost::ASIO library is 
available])
             BN=boost_system
             if test "x$ax_boost_user_asio_lib" = "x"; then
@@ -101,6 +102,7 @@
             if test "x$link_asio" = "xno"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_date_time.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_date_time.m4      
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_date_time.m4      
2008-07-16 19:26:28 UTC (rev 8904)
@@ -74,18 +74,19 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_date_time" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_DATE_TIME,,[define if the Boost::Date_Time 
library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
             if test "x$ax_boost_user_date_time_lib" = "x"; then
                 for libextension in `ls 
$BOOSTLIBDIR/libboost_date_time*.{so,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 
's;^lib\(boost_date_time.*\)\.so.*$;\1;' -e 
's;^lib\(boost_date_time.*\)\.a*$;\1;'` ; do
-                     ax_lib=${libextension}
+                    ax_lib=${libextension}
                     AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_DATE_TIME_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
                                  [link_date_time="no"])
                 done
                 if test "x$link_date_time" != "xyes"; then
                 for libextension in `ls $BOOSTLIBDIR/boost_date_time*.{dll,a}* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_date_time.*\)\.dll.*$;\1;' -e 
's;^\(boost_date_time.*\)\.a*$;\1;'` ; do
-                     ax_lib=${libextension}
+                    ax_lib=${libextension}
                     AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_DATE_TIME_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
                                  [link_date_time="no"])
@@ -97,12 +98,13 @@
                       AC_CHECK_LIB($ax_lib, main,
                                    [BOOST_DATE_TIME_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_DATE_TIME_LIB) link_date_time="yes"; break],
                                    [link_date_time="no"])
-                  done
+               done
 
             fi
             if test "x$link_date_time" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_filesystem.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_filesystem.m4     
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_filesystem.m4     
2008-07-16 19:26:28 UTC (rev 8904)
@@ -74,6 +74,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_filesystem" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem 
library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
             if test "x$ax_boost_user_filesystem_lib" = "x"; then
@@ -102,6 +103,7 @@
             if test "x$link_filesystem" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_iostreams.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_iostreams.m4      
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_iostreams.m4      
2008-07-16 19:26:28 UTC (rev 8904)
@@ -77,6 +77,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_iostreams" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_IOSTREAMS,,[define if the Boost::IOStreams 
library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
             if test "x$ax_boost_user_iostreams_lib" = "x"; then
@@ -106,6 +107,7 @@
             if test "x$link_iostreams" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_program_options.m4
===================================================================
--- 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_program_options.m4    
    2008-07-16 18:23:06 UTC (rev 8903)
+++ 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_program_options.m4    
    2008-07-16 19:26:28 UTC (rev 8904)
@@ -72,6 +72,7 @@
                             AC_LANG_POP([C++])
         ])
         if test "$ax_cv_boost_program_options" = yes; then
+               AC_LANG_PUSH([C++])
                 AC_DEFINE(HAVE_BOOST_PROGRAM_OPTIONS,,[define if the 
Boost::PROGRAM_OPTIONS library is available])
                   BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
                 if test "x$ax_boost_user_program_options_lib" = "x"; then
@@ -99,6 +100,7 @@
                 if test "x$link_program_options" != "xyes"; then
                     AC_MSG_ERROR([Could not link against [$ax_lib] !])
                 fi
+               AC_LANG_POP([C++])
         fi
         CPPFLAGS="$CPPFLAGS_SAVED"
         LDFLAGS="$LDFLAGS_SAVED"

Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_python.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_python.m4 
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_python.m4 
2008-07-16 19:26:28 UTC (rev 8904)
@@ -75,6 +75,7 @@
  CPPFLAGS=$CPPFLAGS_SAVE
 ])
 if test "$ac_cv_boost_python" = "yes"; then
+  AC_LANG_PUSH([C++])
   AC_DEFINE(HAVE_BOOST_PYTHON,,[define if the Boost::Python library is 
available])
   ax_python_lib=boost_python
   AC_ARG_WITH([boost-python],AS_HELP_STRING([--with-boost-python],[specify the 
boost python library or suffix to use]),
@@ -86,5 +87,6 @@
     AC_CHECK_LIB($ax_lib, exit, [BOOST_PYTHON_LIB=$ax_lib break])
   done
   AC_SUBST(BOOST_PYTHON_LIB)
+  AC_LANG_POP([C++])
 fi
 ])dnl

Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_regex.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_regex.m4  
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_regex.m4  
2008-07-16 19:26:28 UTC (rev 8904)
@@ -73,6 +73,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_regex" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_REGEX,,[define if the Boost::Regex library is 
available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
             if test "x$ax_boost_user_regex_lib" = "x"; then
@@ -101,6 +102,7 @@
             if test "x$link_regex" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_serialization.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_serialization.m4  
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_serialization.m4  
2008-07-16 19:26:28 UTC (rev 8904)
@@ -78,6 +78,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_serialization" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_SERIALIZATION,,[define if the 
Boost::Serialization library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
             if test "x$ax_boost_user_serialization_lib" = "x"; then
@@ -107,6 +108,7 @@
             if test "x$link_serialization" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_signals.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_signals.m4        
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_signals.m4        
2008-07-16 19:26:28 UTC (rev 8904)
@@ -75,6 +75,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_signals" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_SIGNALS,,[define if the Boost::Signals 
library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
             if test "x$ax_boost_user_signals_lib" = "x"; then
@@ -104,6 +105,7 @@
             if test "x$link_signals" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_system.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_system.m4 
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_system.m4 
2008-07-16 19:26:28 UTC (rev 8904)
@@ -77,6 +77,7 @@
              AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_system" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_SUBST(BOOST_CPPFLAGS)
 
             AC_DEFINE(HAVE_BOOST_SYSTEM,,[define if the Boost::System library 
is available])
@@ -110,6 +111,7 @@
             if test "x$link_system" = "xno"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_test_exec_monitor.m4
===================================================================
--- 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_test_exec_monitor.m4  
    2008-07-16 18:23:06 UTC (rev 8903)
+++ 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_test_exec_monitor.m4  
    2008-07-16 19:26:28 UTC (rev 8904)
@@ -72,6 +72,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_test_exec_monitor" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_TEST_EXEC_MONITOR,,[define if the 
Boost::Test_Exec_Monitor library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
 
@@ -129,6 +130,7 @@
             if test "x$link_test_exec_monitor" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4 
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4 
2008-07-16 19:26:28 UTC (rev 8904)
@@ -78,6 +78,7 @@
              AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_thread" = "xyes"; then
+           AC_LANG_PUSH([C++])
            BOOST_CXXFLAGS="$PTHREAD_CFLAGS"
             AC_SUBST(BOOST_CXXFLAGS)
 
@@ -114,6 +115,7 @@
                BOOST_THREAD_LIB="$BOOST_THREAD_LIB $PTHREAD_LIBS"
                dnl BOOST_LDFLAGS="$BOOST_LDFLAGS $PTHREAD_LIBS"
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_unit_test_framework.m4
===================================================================
--- 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_unit_test_framework.m4
    2008-07-16 18:23:06 UTC (rev 8903)
+++ 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_unit_test_framework.m4
    2008-07-16 19:26:28 UTC (rev 8904)
@@ -72,6 +72,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the 
Boost::Unit_Test_Framework library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
 
@@ -127,6 +128,7 @@
             if test "x$link_unit_test_framework" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"

Modified: 
gnuradio/branches/developers/eb/sched-wip/config/ax_boost_wserialization.m4
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/config/ax_boost_wserialization.m4 
2008-07-16 18:23:06 UTC (rev 8903)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_wserialization.m4 
2008-07-16 19:26:28 UTC (rev 8904)
@@ -77,6 +77,7 @@
          AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_wserialization" = "xyes"; then
+           AC_LANG_PUSH([C++])
             AC_DEFINE(HAVE_BOOST_WSERIALIZATION,,[define if the 
Boost::WSerialization library is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
             if test "x$ax_boost_user_wserialization_lib" = "x"; then
@@ -106,6 +107,7 @@
             if test "x$link_wserialization" != "xyes"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
             fi
+           AC_LANG_POP([C++])
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"





reply via email to

[Prev in Thread] Current Thread [Next in Thread]