From 8a89c77d6dce64d73cf450d7f04e0279576a2dcd Mon Sep 17 00:00:00 2001 From: Pietro Incardona <incardon@mpi-cbg.de> Date: Fri, 6 Nov 2015 15:10:04 +0100 Subject: [PATCH] Fixing BOOST detection --- configure.ac | 4 ++-- openfpm_data | 2 +- openfpm_devices | 2 +- openfpm_io | 2 +- openfpm_vcluster | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index c0cb52d0..a04b1083 100755 --- a/configure.ac +++ b/configure.ac @@ -218,8 +218,8 @@ fi # eliminate any /usr/lib and and /usr/include from $BOOST_LIB and $BOOST_INCLUDE -BOOST_LDFLAGS=$(echo "$BOOST_LDFLAGS" | sed -e 's/-L\/usr\/lib64//g' | sed -e 's/-L\/usr\/lib//g') -BOOST_CPPFLAGS=$(echo "$BOOST_CPPFLAGS" | sed -e 's/-I\/usr\/include//g') +BOOST_LDFLAGS=$(echo "$BOOST_LDFLAGS" | sed -e 's/ -L\/usr\/lib64[ \b]//g' | sed -e 's/ -L\/usr\/lib[ \b]//g') +BOOST_CPPFLAGS=$(echo "$BOOST_CPPFLAGS" | sed -e 's/-I\/usr\/include[ \b]//g') AC_SUBST(BOOST_LDFLAGS) AC_SUBST(BOOST_CPPFLAGS) diff --git a/openfpm_data b/openfpm_data index 90170160..8c0697ce 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit 90170160c28d16850d43a9c54cbde1f2624d87a1 +Subproject commit 8c0697ce972fc6c4f82aefea2750b12c4bd40b18 diff --git a/openfpm_devices b/openfpm_devices index 2252634e..990728ad 160000 --- a/openfpm_devices +++ b/openfpm_devices @@ -1 +1 @@ -Subproject commit 2252634e1b618e7da8a2c86a58abaef4747d405e +Subproject commit 990728ade63fe50f19ff82dbd555862c74dc8329 diff --git a/openfpm_io b/openfpm_io index 7117dab0..a57523c7 160000 --- a/openfpm_io +++ b/openfpm_io @@ -1 +1 @@ -Subproject commit 7117dab0c2bc4db60e8313fc83b8792330079719 +Subproject commit a57523c7d63fba78fafe6385db759984fc70bc04 diff --git a/openfpm_vcluster b/openfpm_vcluster index e881918b..a8cd9b06 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit e881918b1ce36402589981ea93d5dcd5b3f5e49a +Subproject commit a8cd9b06236b6956dc0e243c259f12471743f07e -- GitLab