[Commit-gnuradio] r8902 - in gnuradio/branches/developers/eb/sched-wip: . config

[eb]

Author: eb
Date: 2008-07-15 23:17:40 -0600 (Tue, 15 Jul 2008)
New Revision: 8902

Modified:
   gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4
   gnuradio/branches/developers/eb/sched-wip/configure.ac
Log:
cleaned up ax_boost_thread.m4

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 03:59:28 UTC (rev 8901)
+++ gnuradio/branches/developers/eb/sched-wip/config/ax_boost_thread.m4 
2008-07-16 05:17:40 UTC (rev 8902)
@@ -29,6 +29,7 @@
 #
 #   Copyright (c) 2008 Thomas Porschberg <address@hidden>
 #   Copyright (c) 2008 Michael Tindal
+#   Copyright (c) 2008 Free Software Foundation, Inc.
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
@@ -36,6 +37,7 @@
 
 AC_DEFUN([AX_BOOST_THREAD],
 [
+    AC_REQUIRE([ACX_PTHREAD])
     AC_ARG_WITH([boost-thread],
     AS_HELP_STRING([--with-boost-thread@<:@=special-lib@:>@],
                    [use the Thread library from boost - it is possible to 
specify a certain library for the linker
@@ -57,64 +59,41 @@
     if test "x$want_boost" = "xyes"; then
         AC_REQUIRE([AC_PROG_CC])
         AC_REQUIRE([AC_CANONICAL_HOST])
-        CPPFLAGS_SAVED="$CPPFLAGS"
-        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-        export CPPFLAGS
 
+        CPPFLAGS_SAVED="$CPPFLAGS"
         LDFLAGS_SAVED="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
-        export LDFLAGS
+       CXXFLAGS_SAVED="$CXXFLAGS"
 
+        CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+        LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $PTHREAD_LIBS"
+       CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
+
         AC_CACHE_CHECK(whether the Boost::Thread library is available,
                        ax_cv_boost_thread,
         [AC_LANG_PUSH([C++])
-             CXXFLAGS_SAVE=$CXXFLAGS
-
-             if test "x$host_os" = "xsolaris" ; then
-                 CXXFLAGS="-pthreads $CXXFLAGS"
-             elif test "x$host_os" = "xming32" ; then
-                 CXXFLAGS="-mthreads $CXXFLAGS"
-             else
-                CXXFLAGS="-pthread $CXXFLAGS"
-             fi
              AC_COMPILE_IFELSE(AC_LANG_PROGRAM(address@hidden:@include 
<boost/thread/thread.hpp>]],
                                    [[boost::thread_group thrds;
                                    return 0;]]),
                    ax_cv_boost_thread=yes, ax_cv_boost_thread=no)
-             CXXFLAGS=$CXXFLAGS_SAVE
              AC_LANG_POP([C++])
         ])
         if test "x$ax_cv_boost_thread" = "xyes"; then
-           if test "x$host_os" = "xsolaris" ; then
-              BOOST_CXXFLAGS="-pthreads $BOOST_CXXFLAGS"
-           elif test "x$host_os" = "xming32" ; then
-              BOOST_CXXFLAGS="-mthreads $BOOST_CXXFLAGS"
-           else
-              BOOST_CXXFLAGS="-pthread $BOOST_CXXFLAGS"
-           fi
-
+           BOOST_CXXFLAGS="$PTHREAD_CFLAGS"
             AC_SUBST(BOOST_CXXFLAGS)
 
             AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library 
is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
 
-            LDFLAGS_SAVE=$LDFLAGS
-                        case "x$host_os" in
-                          *bsd* )
-                               LDFLAGS="-pthread $LDFLAGS"
-                          break;
-                          ;;
-                        esac
             if test "x$ax_boost_user_thread_lib" = "x"; then
                 for libextension in `ls $BOOSTLIBDIR/libboost_thread*.{so,a}* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_thread.*\)\.so.*$;\1;' -e 
's;^lib\(boost_thread.*\)\.a*$;\1;'` ; do
-                     ax_lib=${libextension}
+                    ax_lib=${libextension}
                     AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_THREAD_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
                                  [link_thread="no"])
                 done
                 if test "x$link_thread" != "xyes"; then
                 for libextension in `ls $BOOSTLIBDIR/boost_thread*.{dll,a}* 
2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_thread.*\)\.dll.*$;\1;' -e 
's;^\(boost_thread.*\)\.a*$;\1;'` ; do
-                     ax_lib=${libextension}
+                    ax_lib=${libextension}
                     AC_CHECK_LIB($ax_lib, exit,
                                  [BOOST_THREAD_LIB="-l$ax_lib"; 
AC_SUBST(BOOST_THREAD_LIB) link_thread="yes"; break],
                                  [link_thread="no"])
@@ -131,18 +110,14 @@
             fi
             if test "x$link_thread" = "xno"; then
                 AC_MSG_ERROR(Could not link against $ax_lib !)
-                        else
-                           case "x$host_os" in
-                              *bsd* )
-                    BOOST_LDFLAGS="-pthread $BOOST_LDFLAGS"
-                              break;
-                              ;;
-                           esac
-
+            else
+               BOOST_THREAD_LIB="$BOOST_THREAD_LIB $PTHREAD_LIBS"
+               dnl BOOST_LDFLAGS="$BOOST_LDFLAGS $PTHREAD_LIBS"
             fi
         fi
 
         CPPFLAGS="$CPPFLAGS_SAVED"
         LDFLAGS="$LDFLAGS_SAVED"
+       CXXFLAGS="$CXXFLAGS_SAVED"
     fi
 ])

Modified: gnuradio/branches/developers/eb/sched-wip/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/sched-wip/configure.ac      2008-07-16 
03:59:28 UTC (rev 8901)
+++ gnuradio/branches/developers/eb/sched-wip/configure.ac      2008-07-16 
05:17:40 UTC (rev 8902)
@@ -218,11 +218,6 @@
 CPPUNIT_INCLUDES=$CPPUNIT_CFLAGS
 AC_SUBST(CPPUNIT_INCLUDES)
 
-dnl Define where to find boost includes
-dnl defines BOOST_CFLAGS
-dnl GR_REQUIRE_BOOST_INCLUDES
-
-
 dnl
 dnl Move to config subdir when sorted out
 dnl