AX_BOOST_*: adapted for naming convention in Boost version 1.34

1 files changed, 35 insertions, 46 deletions

diff --git a/m4/ax_boost_unit_test_framework.m4 b/m4/ax_boost_unit_test_framework.m4
index 11e5d8d..195af36 100644
--- a/m4/ax_boost_unit_test_framework.m4
+++ b/m4/ax_boost_unit_test_framework.m4
@@ -21,11 +21,11 @@
 #
 # LAST MODIFICATION
 #
-#   2006-12-28
+#   2007-07-26
 #
 # COPYLEFT
 #
-#   Copyright (c) 2006 Thomas Porschberg <thomas@randspringer.de>
+#   Copyright (c) 2007 Thomas Porschberg <thomas@randspringer.de>
 #
 #   Copying and distribution of this file, with or without
 #   modification, are permitted in any medium without royalty provided
@@ -72,59 +72,48 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
 		])
 		if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
 			AC_DEFINE(HAVE_BOOST_UNIT_TEST_FRAMEWORK,,[define if the Boost::Unit_Test_Framework library is available])
-			BN=boost_unit_test_framework
+			BN_BOOST_TEST_UNIT_TEST_FRAMEWORK_LIB=boost_unit_test_framework
+            BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'`
+
             if test "x$ax_boost_user_unit_test_framework_lib" = "x"; then
          		saved_ldflags="${LDFLAGS}"
-		    	for ax_lib in $BN $BN-$CC $BN-$CC-mt $BN-$CC-mt-s $BN-$CC-s \
-                             lib$BN lib$BN-$CC lib$BN-$CC-mt lib$BN-$CC-mt-s lib$BN-$CC-s \
-                             $BN-mgw $BN-mgw $BN-mgw-mt $BN-mgw-mt-s $BN-mgw-s ; do
-                   LDFLAGS="${LDFLAGS} -l$ax_lib"
-    			   AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,
-	      			    		   ax_cv_boost_unit_test_framework_link,
-						  [AC_LANG_PUSH([C++])
-                   AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>
-                                                     using boost::unit_test::test_suite;
-                                                     test_suite* init_unit_test_suite( int argc, char * argv[] ) {
-                                                     test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" );
-                                                     return test;
-                                                     }
-                                                   ]],
-                                 [[ return 0;]])],
-                                 link_unit_test_framework="yes",link_unit_test_framework="no")
-			      AC_LANG_POP([C++])
-                  ])
-                  LDFLAGS="${saved_ldflags}"
+                for monitor_library in `ls $BOOSTLIBDIR/libboost_unit_test_framework*.{so,a}* 2>/dev/null` ; do
+                    if test -r $monitor_library ; then
+                       libextension=`echo $monitor_library | sed 's,.*/,,' | sed -e 's;^libboost_unit_test_framework\(.*\)\.so.*$;\1;' -e 's;^libboost_unit_test_framework\(.*\)\.a*$;\1;'`
+                       ax_lib=${BN_BOOST_TEST_UNIT_TEST_FRAMEWORK_LIB}${libextension}
+                       link_unit_test_framework="yes"
+                    else
+                       link_unit_test_framework="no"
+                    fi
 
-			      if test "x$link_unit_test_framework" = "xyes"; then
+        		    if test "x$link_unit_test_framework" = "xyes"; then
                       BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
                       AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
 					  break
-				  fi
+				    fi
                 done
             else
+                link_unit_test_framework="no"
          		saved_ldflags="${LDFLAGS}"
-               for ax_lib in $ax_boost_user_unit_test_framework_lib $BN-$ax_boost_user_unit_test_framework_lib; do
-                   LDFLAGS="${LDFLAGS} -l$ax_lib"
-              			   AC_CACHE_CHECK(Boost::UnitTestFramework library linkage,
-	      			    		   ax_cv_boost_unit_test_framework_link,
-						  [AC_LANG_PUSH([C++])
-                           AC_LINK_IFELSE([AC_LANG_PROGRAM([[@%:@include <boost/test/unit_test.hpp>
-                                                        using boost::unit_test::test_suite;
-                                                        test_suite* init_unit_test_suite( int argc, char * argv[] ) {
-                                                        test_suite* test= BOOST_TEST_SUITE( "Unit test example 1" );
-                                                        return test;
-                                                        }
-                                                   ]],
-                                 [[ return 0;]])],
-                                 link_unit_test_framework="yes",link_unit_test_framework="no")
-			      AC_LANG_POP([C++])
-                  ])
-                  LDFLAGS="${saved_ldflags}"
-			      if test "x$link_unit_test_framework" = "xyes"; then
-                      BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
-                      AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
-					  break
-				  fi
+                for ax_lib in $BN_BOOST_TEST_UNIT_TEST_FRAMEWORK_LIB-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do
+                   if test "x$link_unit_test_framework" = "xyes"; then
+                      break;
+                   fi
+                   for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.{so,a}* 2>/dev/null` ; do
+                   if test -r $unittest_library ; then
+                       libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^libboost_unit_test_framework\(.*\)\.so.*$;\1;' -e 's;^libboost_unit_test_framework\(.*\)\.a*$;\1;'`
+                       ax_lib=${BN_BOOST_TEST_UNIT_TEST_FRAMEWORK_LIB}${libextension}
+                       link_unit_test_framework="yes"
+                    else
+                       link_unit_test_framework="no"
+                    fi
+
+			        if test "x$link_unit_test_framework" = "xyes"; then
+                        BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
+                        AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+					    break
+				    fi
+                  done
                done
             fi
 			if test "x$link_unit_test_framework" = "xno"; then