diff --git a/configure.ac b/configure.ac index 7ae1df5501c2556b464828b6168fc828aeeb5f30..878255775f9777dc8506dcbec28ee3e0ead18241 100755 --- a/configure.ac +++ b/configure.ac @@ -8,9 +8,20 @@ AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([src/main.cpp]) AC_CONFIG_SUBDIRS([openfpm_data openfpm_devices openfpm_vcluster openfpm_io]) -#### Adding --with-pdata + +#### Adding --with-pdata option and openfpm_pdata to prefix folder + +if test "$prefix" = "NONE"; then + prefix=/usr/local +fi +base=$prefix +prefix="$prefix/openfpm_pdata" +echo "Installation dir is: $prefix" + ac_configure_args="$ac_configure_args --with-pdata=../../src" + ######################## + AM_INIT_AUTOMAKE AC_CONFIG_HEADER([src/config/config.h]) m4_ifdef([ACX_PTHREAD],,[m4_include([m4/acx_pthread.m4])]) @@ -24,11 +35,6 @@ CXXFLAGS+=" --std=c++11 " NVCCFLAGS=" " INCLUDES_PATH=" " -# Add openfpm_pdata to prefix folder -base=$prefix -prefix="$prefix/openfpm_pdata" -echo "Installation dir is: $prefix" - # Create a file with the install base folder echo "$base" > install_dir diff --git a/openfpm_data b/openfpm_data index daedefca43e556010cc78e0a440195963f3f9ae4..6765c4916efa6adb089370f6837e2a9a614d3930 160000 --- a/openfpm_data +++ b/openfpm_data @@ -1 +1 @@ -Subproject commit daedefca43e556010cc78e0a440195963f3f9ae4 +Subproject commit 6765c4916efa6adb089370f6837e2a9a614d3930 diff --git a/openfpm_devices b/openfpm_devices index 87bcec81a5897e7201f983fe9ae154d7b9ebb11c..56f701912476d32ca6787d7eb72e2c228eb29827 160000 --- a/openfpm_devices +++ b/openfpm_devices @@ -1 +1 @@ -Subproject commit 87bcec81a5897e7201f983fe9ae154d7b9ebb11c +Subproject commit 56f701912476d32ca6787d7eb72e2c228eb29827 diff --git a/openfpm_io b/openfpm_io index d51103f7beccd3f5fc58bf3165c60fc7a812ae56..beca050ebcea4f7d23de3689925e1b08b73b8d4e 160000 --- a/openfpm_io +++ b/openfpm_io @@ -1 +1 @@ -Subproject commit d51103f7beccd3f5fc58bf3165c60fc7a812ae56 +Subproject commit beca050ebcea4f7d23de3689925e1b08b73b8d4e diff --git a/openfpm_vcluster b/openfpm_vcluster index 79f26ee6df84e69ebda01f6bdc8b3b5b59542f28..b573bb0fae7134f2124399859ea7a353c397cf74 160000 --- a/openfpm_vcluster +++ b/openfpm_vcluster @@ -1 +1 @@ -Subproject commit 79f26ee6df84e69ebda01f6bdc8b3b5b59542f28 +Subproject commit b573bb0fae7134f2124399859ea7a353c397cf74