Commit: 21fcaacbbd50f26f9db16e4cd890d9c9055779f4 - MolDS (git)

Commit MetaInfo

• Revisión: 21fcaacbbd50f26f9db16e4cd890d9c9055779f4 (tree)
• Tiempo: 2013-01-02 02:29:31
• Autor: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Log Message

Use AM_CPP/LDFLAGS to pass boost cpp/ld flags. #28588

git-svn-id: https://svn.sourceforge.jp/svnroot/molds/branches/automake@1225 1136aad2-a195-0410-b898-f5ea1d11b9d8

Cambiar Resumen

• modified: src/Makefile.am
• modified: src/configure.ac

Diferencia incremental

--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,4 +47,6 @@ OPENBLAS_INCLUDE_DIR=$(OPENBLAS_ROOT)/include
 OPENBLAS_LIB_DIR=$(OPENBLAS_ROOT)/lib
 AM_CPPFLAGS+= -I$(OPENBLAS_INCLUDE_DIR)
 AM_LDFLAGS+= -L$(OPENBLAS_LIB_DIR)
+AM_CPPFLAGS+= $(BOOST_CPPLAGS)
+AM_LDFLAGS+= $(BOOST_LDFLAGS)
 endif

--- a/src/configure.ac
+++ b/src/configure.ac
@@ -175,8 +175,6 @@ AC_CACHE_CHECK([whether ld accepts -rpath option],[molds_cv_ld_accepts_rpath],
 
 AS_IF([test x$molds_cv_ld_accepts_rpath == xyes],
       [BOOST_LDFLAGS="$BOOST_LDFLAGS -Wl,-rpath=$BOOST_LIBDIR"])
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
 
 AC_CHECK_HEADERS([boost/random.hpp],,[AC_MSG_FAILURE([Cannot find boost/random.hpp!])])