[Debian-astro-commits] [gyoto] 207/221: Improve Boost.mpi detection. Slightly tuned to ObsPM cluster...
Thibaut Jean-Claude Paumard
thibaut at moszumanska.debian.org
Fri May 22 20:52:47 UTC 2015
This is an automated email from the git hooks/post-receive script.
thibaut pushed a commit to branch master
in repository gyoto.
commit 17aca8b349c38a4e5ef2355422feadd781414c63
Author: Thibaut Paumard <thibaut.paumard at obspm.fr>
Date: Fri Mar 27 12:45:42 2015 +0100
Improve Boost.mpi detection. Slightly tuned to ObsPM cluster...
---
Makefile.in | 3 +
bin/Makefile.am | 5 +-
bin/Makefile.in | 9 +-
config.h.in | 3 +
configure | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
configure.ac | 7 +-
lib/Makefile.am | 3 +-
lib/Makefile.in | 7 +-
8 files changed, 320 insertions(+), 8 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 089a1a5..66c2886 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -167,6 +167,9 @@ BOOST_MPI_LDFLAGS = @BOOST_MPI_LDFLAGS@
BOOST_MPI_LDPATH = @BOOST_MPI_LDPATH@
BOOST_MPI_LIBS = @BOOST_MPI_LIBS@
BOOST_ROOT = @BOOST_ROOT@
+BOOST_SERIALIZATION_LDFLAGS = @BOOST_SERIALIZATION_LDFLAGS@
+BOOST_SERIALIZATION_LDPATH = @BOOST_SERIALIZATION_LDPATH@
+BOOST_SERIALIZATION_LIBS = @BOOST_SERIALIZATION_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFITSIOCPPFLAGS = @CFITSIOCPPFLAGS@
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 7ca7d78..1258b36 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -13,7 +13,8 @@ dist_man_MANS += gyoto.1
endif
if HAVE_MPI
-AM_LDFLAGS += -lboost_mpi -lboost_serialization
+AM_LDFLAGS += $(BOOST_MPI_LDFLAGS) -lboost_mpi \
+ $(BOOST_SERIALIZATION_LDFLAGS) -lboost_serialization
bin_PROGRAMS += gyoto-mpi-worker. at sovers@
dist_man_MANS += gyoto-mpi-worker. at sovers@.1
CLEANFILES += gyoto-mpi-worker. at sovers@.1
@@ -25,7 +26,7 @@ gyoto_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
gyoto_mpi_worker_ at sovers@_SOURCES = gyoto-mpi-worker.C
-gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la -lboost_mpi -lboost_serialization
+gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la
gyoto_mpi_worker_ at sovers@_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_mpi_worker_ at sovers@_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 3a14558..f351773 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -55,7 +55,9 @@ target_triplet = @target@
bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
@BUILD_GYOTO_TRUE at am__append_1 = gyoto
@BUILD_GYOTO_TRUE at am__append_2 = gyoto.1
- at HAVE_MPI_TRUE@am__append_3 = -lboost_mpi -lboost_serialization
+ at HAVE_MPI_TRUE@am__append_3 = $(BOOST_MPI_LDFLAGS) -lboost_mpi \
+ at HAVE_MPI_TRUE@ $(BOOST_SERIALIZATION_LDFLAGS) -lboost_serialization
+
@HAVE_MPI_TRUE at am__append_4 = gyoto-mpi-worker. at sovers@
@HAVE_MPI_TRUE at am__append_5 = gyoto-mpi-worker. at sovers@.1
@HAVE_MPI_TRUE at am__append_6 = gyoto-mpi-worker. at sovers@.1
@@ -172,6 +174,9 @@ BOOST_MPI_LDFLAGS = @BOOST_MPI_LDFLAGS@
BOOST_MPI_LDPATH = @BOOST_MPI_LDPATH@
BOOST_MPI_LIBS = @BOOST_MPI_LIBS@
BOOST_ROOT = @BOOST_ROOT@
+BOOST_SERIALIZATION_LDFLAGS = @BOOST_SERIALIZATION_LDFLAGS@
+BOOST_SERIALIZATION_LDPATH = @BOOST_SERIALIZATION_LDPATH@
+BOOST_SERIALIZATION_LIBS = @BOOST_SERIALIZATION_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFITSIOCPPFLAGS = @CFITSIOCPPFLAGS@
@@ -357,7 +362,7 @@ gyoto_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la
gyoto_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
gyoto_mpi_worker_ at sovers@_SOURCES = gyoto-mpi-worker.C
-gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la -lboost_mpi -lboost_serialization
+gyoto_mpi_worker_ at sovers@_LDADD = @top_builddir@/lib/libgyoto at FEATURES@.la
gyoto_mpi_worker_ at sovers@_CPPFLAGS = $(AM_CPPFLAGS) $(CFITSIOCPPFLAGS)
gyoto_mpi_worker_ at sovers@_LDFLAGS = $(AM_LDFLAGS) $(CFITSIOLDFLAGS) -export-dynamic
EXAMPLE_DIR = $(top_srcdir)/doc/examples/
diff --git a/config.h.in b/config.h.in
index 0196ef3..eb6f6da 100644
--- a/config.h.in
+++ b/config.h.in
@@ -24,6 +24,9 @@
/* Define to 1 if you have <boost/mpi/environment.hpp> */
#undef HAVE_BOOST_MPI_ENVIRONMENT_HPP
+/* Define to 1 if you have <boost/serialization/base_object.hpp> */
+#undef HAVE_BOOST_SERIALIZATION_BASE_OBJECT_HPP
+
/* define if the compiler supports basic C++11 syntax */
#undef HAVE_CXX11
diff --git a/configure b/configure
index 9164491..e7dcb1a 100755
--- a/configure
+++ b/configure
@@ -692,6 +692,9 @@ PKG_CONFIG_PATH
PKG_CONFIG
HAVE_MPI_FALSE
HAVE_MPI_TRUE
+BOOST_SERIALIZATION_LIBS
+BOOST_SERIALIZATION_LDPATH
+BOOST_SERIALIZATION_LDFLAGS
BOOST_MPI_LIBS
BOOST_LDPATH
BOOST_MPI_LDPATH
@@ -16809,10 +16812,12 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test "x$MPICXX" != x && test "x$have_boost" == xyes; then :
+if test "x$MPICXX" != x && test "x$have_boost" == xyes && test "x$with_mpi" != xno; then :
ax_save_CXX=$CXX
+ ax_save_CPP=$CXXCPP
CXX=$MPICXX
+ CXXCPP="$MPICXX -E"
if test x"$boost_cv_inc_path" = xno; then
have_mpi=no
CXX=$ax_save_CXX
@@ -17115,6 +17120,290 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
fi
+ if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for the Boost serialization library" >&5
+$as_echo "$as_me: Boost not available, not searching for the Boost serialization library" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+if test x"$boost_cv_inc_path" = xno; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Boost not available, not searching for boost/serialization/base_object.hpp" >&5
+$as_echo "$as_me: Boost not available, not searching for boost/serialization/base_object.hpp" >&6;}
+else
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+ac_fn_cxx_check_header_mongrel "$LINENO" "boost/serialization/base_object.hpp" "ac_cv_header_boost_serialization_base_object_hpp" "$ac_includes_default"
+if test "x$ac_cv_header_boost_serialization_base_object_hpp" = xyes; then :
+
+$as_echo "#define HAVE_BOOST_SERIALIZATION_BASE_OBJECT_HPP 1" >>confdefs.h
+
+else
+ as_fn_error $? "cannot find boost/serialization/base_object.hpp" "$LINENO" 5
+fi
+
+
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
+boost_save_CPPFLAGS=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the Boost serialization library" >&5
+$as_echo_n "checking for the Boost serialization library... " >&6; }
+if ${boost_cv_lib_serialization+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ boost_cv_lib_serialization=no
+ case "" in #(
+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #(
+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X" : 'Xmt-*\(.*\)'`;; #(
+ (*) boost_mt=; boost_rtopt=;;
+ esac
+ if test $enable_static_boost = yes; then
+ boost_rtopt="s$boost_rtopt"
+ fi
+ # Find the proper debug variant depending on what we've been asked to find.
+ case $boost_rtopt in #(
+ (*d*) boost_rt_d=$boost_rtopt;; #(
+ (*[sgpn]*) # Insert the `d' at the right place (in between `sg' and `pn')
+ boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #(
+ (*) boost_rt_d='-d';;
+ esac
+ # If the PREFERRED-RT-OPT are not empty, prepend a `-'.
+ test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt"
+ $boost_guess_use_mt && boost_mt=-mt
+ # Look for the abs path the static archive.
+ # $libext is computed by Libtool but let's make sure it's non empty.
+ test -z "$libext" &&
+ as_fn_error $? "the libext variable is empty, did you invoke Libtool?" "$LINENO" 5
+ boost_save_ac_objext=$ac_objext
+ # Generate the test file.
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <boost/serialization/base_object.hpp>
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+ if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_objext=do_not_rm_me_plz
+else
+ as_fn_error $? "cannot compile a test that uses Boost serialization" "$LINENO" 5
+fi
+rm -f core conftest.err conftest.$ac_objext
+ ac_objext=$boost_save_ac_objext
+ boost_failed_libs=
+# Don't bother to ident the following nested for loops, only the 2
+# innermost ones matter.
+for boost_lib_ in serialization; do
+for boost_tag_ in -$boost_cv_lib_tag ''; do
+for boost_ver_ in -$boost_cv_lib_version ''; do
+for boost_mt_ in $boost_mt -mt ''; do
+for boost_rtopt_ in $boost_rtopt '' -d; do
+ for boost_lib in \
+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \
+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \
+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \
+ boost_$boost_lib_$boost_tag_$boost_ver_
+ do
+ # Avoid testing twice the same lib
+ case $boost_failed_libs in #(
+ (*@$boost_lib@*) continue;;
+ esac
+ # If with_boost is empty, we'll search in /lib first, which is not quite
+ # right so instead we'll try to a location based on where the headers are.
+ boost_tmp_lib=$with_boost
+ test x"$with_boost" = x && boost_tmp_lib=${boost_cv_inc_path%/include}
+ for boost_ldpath in "$boost_tmp_lib/lib" '' \
+ /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \
+ "$with_boost" C:/Boost/lib /lib*
+ do
+ # Don't waste time with directories that don't exist.
+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then
+ continue
+ fi
+ boost_save_LDFLAGS=$LDFLAGS
+ # Are we looking for a static library?
+ case $boost_ldpath:$boost_rtopt_ in #(
+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt)
+ boost_cv_lib_serialization_LIBS="$boost_ldpath/lib$boost_lib.$libext"
+ test -e "$boost_cv_lib_serialization_LIBS" || continue;; #(
+ (*) # No: use -lboost_foo to find the shared library.
+ boost_cv_lib_serialization_LIBS="-l$boost_lib";;
+ esac
+ boost_save_LIBS=$LIBS
+ LIBS="$boost_cv_lib_serialization_LIBS $LIBS"
+ test x"$boost_ldpath" != x && LDFLAGS="$LDFLAGS -L$boost_ldpath"
+ rm -f conftest$ac_exeext
+boost_save_ac_ext=$ac_ext
+boost_use_source=:
+# If we already have a .o, re-use it. We change $ac_ext so that $ac_link
+# tries to link the existing object file instead of compiling from source.
+test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
+ $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_executable_p conftest$ac_exeext
+ }; then :
+ boost_cv_lib_serialization=yes
+else
+ if $boost_use_source; then
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+ boost_cv_lib_serialization=no
+fi
+ac_objext=$boost_save_ac_objext
+ac_ext=$boost_save_ac_ext
+rm -f core conftest.err conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ ac_objext=$boost_save_ac_objext
+ LDFLAGS=$boost_save_LDFLAGS
+ LIBS=$boost_save_LIBS
+ if test x"$boost_cv_lib_serialization" = xyes; then
+ # Check or used cached result of whether or not using -R or
+ # -rpath makes sense. Some implementations of ld, such as for
+ # Mac OSX, require -rpath but -R is the flag known to work on
+ # other systems. https://github.com/tsuna/boost.m4/issues/19
+ if ${boost_cv_rpath_link_ldflag+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $boost_ldpath in
+ '') # Nothing to do.
+ boost_cv_rpath_link_ldflag=
+ boost_rpath_link_ldflag_found=yes;;
+ *)
+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do
+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+ LIBS="$boost_save_LIBS $boost_cv_lib_serialization_LIBS"
+ rm -f conftest$ac_exeext
+boost_save_ac_ext=$ac_ext
+boost_use_source=:
+# If we already have a .o, re-use it. We change $ac_ext so that $ac_link
+# tries to link the existing object file instead of compiling from source.
+test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false &&
+ $as_echo "$as_me:${as_lineno-$LINENO}: re-using the existing conftest.$ac_objext" >&5
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
+ ac_status=$?
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_executable_p conftest$ac_exeext
+ }; then :
+ boost_rpath_link_ldflag_found=yes
+ break
+else
+ if $boost_use_source; then
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ fi
+ boost_rpath_link_ldflag_found=no
+fi
+ac_objext=$boost_save_ac_objext
+ac_ext=$boost_save_ac_ext
+rm -f core conftest.err conftest_ipa8_conftest.oo \
+ conftest$ac_exeext
+ done
+ ;;
+ esac
+ if test "x$boost_rpath_link_ldflag_found" != "xyes"; then :
+ as_fn_error $? "Unable to determine whether to use -R or -rpath" "$LINENO" 5
+fi
+ LDFLAGS=$boost_save_LDFLAGS
+ LIBS=$boost_save_LIBS
+
+fi
+
+ test x"$boost_ldpath" != x &&
+ boost_cv_lib_serialization_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath"
+ boost_cv_lib_serialization_LDPATH="$boost_ldpath"
+ break 7
+ else
+ boost_failed_libs="$boost_failed_libs@$boost_lib@"
+ fi
+ done
+ done
+done
+done
+done
+done
+done # boost_lib_
+rm -f conftest.$ac_objext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $boost_cv_lib_serialization" >&5
+$as_echo "$boost_cv_lib_serialization" >&6; }
+case $boost_cv_lib_serialization in #(
+ (no) $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ as_fn_error $? "cannot find the flags to link with Boost serialization" "$LINENO" 5
+ ;;
+esac
+BOOST_SERIALIZATION_LDFLAGS=$boost_cv_lib_serialization_LDFLAGS
+BOOST_SERIALIZATION_LDPATH=$boost_cv_lib_serialization_LDPATH
+BOOST_LDPATH=$boost_cv_lib_serialization_LDPATH
+BOOST_SERIALIZATION_LIBS=$boost_cv_lib_serialization_LIBS
+CPPFLAGS=$boost_save_CPPFLAGS
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+fi
+
have_mpi=yes
else
diff --git a/configure.ac b/configure.ac
index c8a757d..d8b5767 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,10 +103,12 @@ AS_IF([test "x$have_boost" == "xno"],
have_mpi=no
AC_CHECK_PROGS([MPICXX], [mpic++ mpicxx])
-AS_IF([test "x$MPICXX" != x && test "x$have_boost" == xyes],
+AS_IF([test "x$MPICXX" != x && test "x$have_boost" == xyes && test "x$with_mpi" != xno],
[
ax_save_CXX=$CXX
+ ax_save_CPP=$CXXCPP
CXX=$MPICXX
+ CXXCPP="$MPICXX -E"
BOOST_FIND_HEADER([boost/mpi/environment.hpp],
[have_mpi=no
CXX=$ax_save_CXX
@@ -116,6 +118,9 @@ AS_IF([test "x$MPICXX" != x && test "x$have_boost" == xyes],
[
BOOST_FIND_LIBS([mpi], [mpi], [], [boost/mpi/environment.hpp],
[boost::mpi::environment()], [])
+ BOOST_FIND_LIBS([serialization], [serialization], [],
+ [boost/serialization/base_object.hpp],
+ [], [])
have_mpi=yes
])
]
diff --git a/lib/Makefile.am b/lib/Makefile.am
index efe4546..f909659 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,7 +4,8 @@ AM_LDFLAGS = $(XERCESLDFLAGS) -export-dynamic $(PTHREAD_LIBS) \
$(UDUNITS_LDFLAGS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS) -DGYOTO_PREFIX=\"${prefix}\"
if HAVE_MPI
-AM_LDFLAGS += -lboost_mpi -lboost_serialization
+AM_LDFLAGS += $(BOOST_MPI_LDFLAGS) -lboost_mpi \
+ $(BOOST_SERIALIZATION_LDFLAGS) -lboost_serialization
endif
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 61b1eb9..d6785d9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -54,7 +54,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
- at HAVE_MPI_TRUE@am__append_1 = -lboost_mpi -lboost_serialization
+ at HAVE_MPI_TRUE@am__append_1 = $(BOOST_MPI_LDFLAGS) -lboost_mpi \
+ at HAVE_MPI_TRUE@ $(BOOST_SERIALIZATION_LDFLAGS) -lboost_serialization
+
# LORENE PLUGIN
@HAVE_LORENE_TRUE at am__append_2 = libgyoto-lorene.la
@@ -187,6 +189,9 @@ BOOST_MPI_LDFLAGS = @BOOST_MPI_LDFLAGS@
BOOST_MPI_LDPATH = @BOOST_MPI_LDPATH@
BOOST_MPI_LIBS = @BOOST_MPI_LIBS@
BOOST_ROOT = @BOOST_ROOT@
+BOOST_SERIALIZATION_LDFLAGS = @BOOST_SERIALIZATION_LDFLAGS@
+BOOST_SERIALIZATION_LDPATH = @BOOST_SERIALIZATION_LDPATH@
+BOOST_SERIALIZATION_LIBS = @BOOST_SERIALIZATION_LIBS@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFITSIOCPPFLAGS = @CFITSIOCPPFLAGS@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git
More information about the Debian-astro-commits
mailing list