From d82c65ec562c01799cd50a8cf8bfe485f1a236ac Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Fri, 6 Nov 2015 12:26:45 +0100 Subject: [PATCH] New BOOST macro --- m4/ax_boost_iostreams.m4 | 6 ++++-- m4/ax_boost_program_options.m4 | 6 ++++-- m4/ax_boost_unit_test_framework.m4 | 8 +++++--- openfpm_data | 2 +- openfpm_devices | 2 +- openfpm_io | 2 +- openfpm_vcluster | 2 +- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/m4/ax_boost_iostreams.m4 b/m4/ax_boost_iostreams.m4 index 4ada3ee1..b4e970be 100644 --- a/m4/ax_boost_iostreams.m4 +++ b/m4/ax_boost_iostreams.m4 @@ -103,10 +103,12 @@ AC_DEFUN([AX_BOOST_IOSTREAMS], fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + echo "Could not find a version of the library!" + exit 202 fi if test "x$link_iostreams" != "xyes"; then - AC_MSG_ERROR(Could not link against $ax_lib !) + echo "Could not link against $ax_lib !" + exit 202 fi fi diff --git a/m4/ax_boost_program_options.m4 b/m4/ax_boost_program_options.m4 index 0f0022ef..e508ea37 100644 --- a/m4/ax_boost_program_options.m4 +++ b/m4/ax_boost_program_options.m4 @@ -96,10 +96,12 @@ AC_DEFUN([AX_BOOST_PROGRAM_OPTIONS], done fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + echo "Could not find a version of the library!" + exit 202 fi if test "x$link_program_options" != "xyes"; then - AC_MSG_ERROR([Could not link against [$ax_lib] !]) + echo "Could not link against [$ax_lib] !" + exit 202 fi fi CPPFLAGS="$CPPFLAGS_SAVED" diff --git a/m4/ax_boost_unit_test_framework.m4 b/m4/ax_boost_unit_test_framework.m4 index 4b809ccf..ff3e8b0f 100644 --- a/m4/ax_boost_unit_test_framework.m4 +++ b/m4/ax_boost_unit_test_framework.m4 @@ -124,14 +124,16 @@ AC_DEFUN([AX_BOOST_UNIT_TEST_FRAMEWORK], done fi if test "x$ax_lib" = "x"; then - AC_MSG_ERROR(Could not find a version of the library!) + echo "Could not find a version of the library!" + exit 202 fi if test "x$link_unit_test_framework" != "xyes"; then - AC_MSG_ERROR(Could not link against $ax_lib !) + echo "Could not link against $ax_lib !" + exit 202 fi fi CPPFLAGS="$CPPFLAGS_SAVED" LDFLAGS="$LDFLAGS_SAVED" fi -]) \ No newline at end of file +]) diff --git a/openfpm_data b/openfpm_data index 2a0f6aa8..90170160 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit 2a0f6aa8e0d04c41722c9bb7c3c82ff1c6a7a393 +Subproject commit 90170160c28d16850d43a9c54cbde1f2624d87a1 diff --git a/openfpm_devices b/openfpm_devices index d029df30..2252634e 160000 --- a/openfpm_devices +++ b/openfpm_devices @@ -1 +1 @@ -Subproject commit d029df30bee9e3866860579ce9adb85d80fa2b8f +Subproject commit 2252634e1b618e7da8a2c86a58abaef4747d405e diff --git a/openfpm_io b/openfpm_io index ba2a9eb2..7117dab0 160000 --- a/openfpm_io +++ b/openfpm_io @@ -1 +1 @@ -Subproject commit ba2a9eb22820165ccbebf495180d8cd18d86da55 +Subproject commit 7117dab0c2bc4db60e8313fc83b8792330079719 diff --git a/openfpm_vcluster b/openfpm_vcluster index f8e1079b..e881918b 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit f8e1079b7d2f4ddcbc15e76b401f05b2abfd330e +Subproject commit e881918b1ce36402589981ea93d5dcd5b3f5e49a -- GitLab