Changeset 784b62 for configure.ac

Timestamp:

Oct 11, 2015, 12:20:48 AM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

386d10

Parents:

6e10c12

git-author:

Frederik Heber <heber@…> (10/10/15 23:47:03)

git-committer:

Frederik Heber <heber@…> (10/11/15 00:20:48)

Message:

tempcommit: Merge with decad7f

• removed libext check from boost.m4 as libtool is not used in scafacos.

File:

• configure.ac (modified) (2 diffs)

configure.ac

@@ -180 +180 @@
 BOOST_TEST
 
-AM_CONDITIONAL([COND_HAVE_BOOST_UNIT_TEST], [test "x$have_boost" = xyes && test x"$ax_cv_boost_unit_test_framework" = xyes])
-AM_CONDITIONAL([COND_HAVE_BOOST_UNIT_TEST_LIB], [test "x$have_boost" = xyes && test x"$ax_cv_boost_unit_test_framework" = xyes && test x"$ax_cv_boost_unit_test_framework_lib" = xyes])
+AM_CONDITIONAL([COND_HAVE_BOOST_UNIT_TEST], [test x"$boost_cv_lib_unit_test_framework" = xyes])
+AM_CONDITIONAL([COND_HAVE_BOOST_UNIT_TEST_LIB], [test x"$boost_cv_lib_unit_test_framework" = xyes])
 
 AC_PROG_RANLIB
@@ -217 +217 @@
 AX_FCS_PACKAGE_ADD([vmg_LIBS],[-lfcs_vmg])
 AX_FCS_PACKAGE_ADD([vmg_LIBS_A],[src/libfcs_vmg.a])
-AX_FCS_PACKAGE_ADD([vmg_LDADD],[$VTK_LDFLAGS $VTK_LIBS $BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $LAPACK_LIBS $BLAS_LIBS])
+AX_FCS_PACKAGE_ADD([vmg_LDADD],[$VTK_LDFLAGS $VTK_LIBS $BOOST_SYSTEM_LDFLAGS $BOOST_SYSTEM_LIBS $BOOST_FILESYSTEM_LDFLAGS $BOOST_FILESYSTEM_LIBS $LAPACK_LIBS $BLAS_LIBS])
 AX_FCS_PACKAGE_ADD([CXXLIBS_USE],[yes])
 ])