[Commit-gnuradio] r9318 - gnuradio/branches/developers/eb/ac-wip/config

[eb]

Author: eb
Date: 2008-08-18 16:54:08 -0600 (Mon, 18 Aug 2008)
New Revision: 9318

Modified:
   gnuradio/branches/developers/eb/ac-wip/config/ax_boost_thread.m4
Log:
work-in-progress on boost m4 macros

Modified: gnuradio/branches/developers/eb/ac-wip/config/ax_boost_thread.m4
===================================================================
--- gnuradio/branches/developers/eb/ac-wip/config/ax_boost_thread.m4    
2008-08-18 22:37:43 UTC (rev 9317)
+++ gnuradio/branches/developers/eb/ac-wip/config/ax_boost_thread.m4    
2008-08-18 22:54:08 UTC (rev 9318)
@@ -1,5 +1,6 @@
 # ===========================================================================
-#            http://autoconf-archive.cryp.to/ax_boost_thread.html
+# Started with http://autoconf-archive.cryp.to/ax_boost_thread.html,
+# but difference is now huge...
 # ===========================================================================
 #
 # SYNOPSIS
@@ -9,8 +10,7 @@
 # DESCRIPTION
 #
 #   Test for Thread library from the Boost C++ libraries. The macro requires
-#   a preceding call to AX_BOOST_BASE. Further documentation is available at
-#   <http://randspringer.de/boost/index.html>.
+#   a preceding call to AX_BOOST_BASE.
 #
 #   This macro calls:
 #
@@ -21,10 +21,6 @@
 #
 #     HAVE_BOOST_THREAD
 #
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
 # COPYLEFT
 #
 #   Copyright (c) 2008 Thomas Porschberg <address@hidden>
@@ -56,6 +52,8 @@
         [want_boost="yes"]
     )
 
+    unit_name="boost_thread"
+
     if test "x$want_boost" = "xyes"; then
         AC_REQUIRE([AC_PROG_CC])
         AC_REQUIRE([AC_CANONICAL_HOST])
@@ -85,35 +83,44 @@
             AC_DEFINE(HAVE_BOOST_THREAD,,[define if the Boost::Thread library 
is available])
             BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
 
-            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}
+           dnl See if we can find a usable library
+
+           link_thread="no"
+
+           if test "$ax_boost_user_thread_lib" != ""; then
+
+               dnl use what the user supplied 
+
+                for ax_lib in $ax_boost_user_thread_lib 
${unit_name}-${ax_boost_user_thread_lib}; do
                     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}
+
+            else
+
+               dnl Look in BOOSTLIBDIR for possible candiates
+
+               head=$BOOSTLIBDIR/lib${unit_name}
+
+               for f in ${head}*.so* ${head}*.a* ${head}*.dll*; do
+                   echo 1: $f
+                   f=`echo $f | sed -e 's,.*/,,' -e 's,^lib,,'`
+                   echo 2: $f
+                   f=`echo $f | sed -e 's,\(boost_thread.*\)\.so.*$,\1,' -e 
's,\(boost_thread.*\)\.a.*$,\1,' -e 's,\(boost_thread.*\)\.dll.*$,\1,'`
+                   echo 3: $f
+
+                   ax_lib=$f
                     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
-                fi
-
-            else
-               for ax_lib in $ax_boost_user_thread_lib 
boost_thread-$ax_boost_user_thread_lib; do
-                      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
-
-            fi
+               done
+           fi              
+                                   
             if test "x$link_thread" = "xno"; then
-                AC_MSG_ERROR(Could not link against $ax_lib !)
+                AC_MSG_ERROR([Could not link against lib${unit_name}!])
             else
                BOOST_THREAD_LIB="$BOOST_THREAD_LIB $PTHREAD_LIBS"
-               dnl BOOST_LDFLAGS="$BOOST_LDFLAGS $PTHREAD_LIBS"
             fi
            AC_LANG_POP([C++])
         fi