OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the logic to support --with-unit*=speciallib syntax

Browse Source 
This change implements the approach of (e.g.,) ax_boost_system.m4, but
may lose some of the initial refinements.  In that case, we will have to
refine this code.
This commit is contained in:
Bård Skaflestad
2012-08-24 19:44:13 +02:00
parent de3b7f002f
commit 233e3601a8
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
m4/ax_boost_unit_test_framework.m4
View File

@@ -104,24 +104,29 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK],
link_unit_test_framework="no" link_unit_test_framework="no"
saved_ldflags="${LDFLAGS}" saved_ldflags="${LDFLAGS}"
for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do for ax_lib in boost_unit_test_framework-$ax_boost_user_unit_test_framework_lib $ax_boost_user_unit_test_framework_lib ; do
if test "x$link_unit_test_framework" = "xyes"; then #if test "x$link_unit_test_framework" = "xyes"; then
break; # break;
fi #fi
for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.so* $BOOSTLIBDIR/lib${ax_lib}.a* 2>/dev/null` ; do #for unittest_library in `ls $BOOSTLIBDIR/lib${ax_lib}.so* $BOOSTLIBDIR/lib${ax_lib}.a* 2>/dev/null` ; do
if test -r $unittest_library ; then #if test -r $unittest_library ; then
libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'` # libextension=`echo $unittest_library | sed 's,.*/,,' | sed -e 's;^lib\(boost_unit_test_framework.*\)\.so.*$;\1;' -e 's;^lib\(boost_unit_test_framework.*\)\.a*$;\1;'`
ax_lib=${libextension} # ax_lib=${libextension}
link_unit_test_framework="yes" # link_unit_test_framework="yes"
else # else
link_unit_test_framework="no" # link_unit_test_framework="no"
fi # 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
if test "x$link_unit_test_framework" = "xyes"; then # done
BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"
AC_SUBST(BOOST_UNIT_TEST_FRAMEWORK_LIB) AC_CHECK_LIB($ax_lib, [exit],
break [BOOST_UNIT_TEST_FRAMEWORK_LIB="-l$ax_lib"; AC_SUBST([BOOST_UNIT_TEST_FRAMEWORK_LIB]) link_unit_test_framework="yes"; break],
fi [link_unit_test_framework="no"])
done
done done
fi fi
if test "x$ax_lib" = "x"; then if test "x$ax_lib" = "x"; then