Commit: 8eed608234b86d424cab6271f17ac4176e8b1f83 - MolDS (git)

Commit MetaInfo

• Revision: 8eed608234b86d424cab6271f17ac4176e8b1f83 (tree)
• Zeit: 2013-01-02 02:41:53
• Autor: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Log Message

Generate files by autoreconf 2.69 with automake 1.11.6. #28588

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

Ändern Zusammenfassung

• modified: src/Makefile.in
• modified: src/configure

Diff

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -52,8 +52,10 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = MolDS$(EXEEXT)
-@USE_OPENBLAS_DIR_TRUE@am__append_1 = -I$(OPENBLAS_INCLUDE_DIR)
-@USE_OPENBLAS_DIR_TRUE@am__append_2 = -L$(OPENBLAS_LIB_DIR)
+@USE_OPENBLAS_DIR_TRUE@am__append_1 = -I$(OPENBLAS_INCLUDE_DIR) \
+@USE_OPENBLAS_DIR_TRUE@	$(BOOST_CPPLAGS)
+@USE_OPENBLAS_DIR_TRUE@am__append_2 = -L$(OPENBLAS_LIB_DIR) \
+@USE_OPENBLAS_DIR_TRUE@	$(BOOST_LDFLAGS)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \

--- a/src/configure
+++ b/src/configure
@@ -4955,10 +4955,8 @@ if test "${with_openblas+set}" = set; then :
     if test -d $withval; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: Using OpenBLAS under \`$withval'." >&5
 $as_echo "$as_me: Using OpenBLAS under \`$withval'." >&6;}
-                             BLAS_LIBS=-lopenblas
-                             OPENBLAS_ROOT=$withval
-                             CPPFLAGS="$CPPFLAGS -I$OPENBLAS_ROOT/include"
-                             LDFLAGS="$LDFLAGS -L$OPENBLAS_ROOT/lib"
+                            BLAS_LIBS=-lopenblas
+                            OPENBLAS_ROOT=$withval
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -7028,7 +7026,7 @@ fi
 done
 
 
-if test x$molds_lapack_cinterface_found != xyes; then :
+if test x$molds_blas_cinterface_found != xyes; then :
   for ac_func in cblas_dcopy cblas_daxpy cblas_ddot cblas_dgemv cblas_dgemm cblas_dsymv cblas_dsyr
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -7037,15 +7035,15 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
- molds_lapack_cinterface_found=yes
+ molds_blas_cinterface_found=yes
 else
-  molds_lapack_cinterface_found=no;break
+  molds_blas_cinterface_found=no;break
 fi
 done
 
 fi
 
-if test x$molds_lapack_cinterface_found != xyes; then :
+if test x$molds_blas_cinterface_found != xyes; then :
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "Cannot find C interface functions of BLAS!
@@ -7733,8 +7731,32 @@ fi
 
 
 
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-LDFLAGS="$LDFLAGS -Wl,-rpath=$BOOST_LIBDIR $BOOST_LDFLAGS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ld accepts -rpath option" >&5
+$as_echo_n "checking whether ld accepts -rpath option... " >&6; }
+if ${molds_cv_ld_accepts_rpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  LDFLAGS_save=$LDFLAGS
+               LDFLAGS="-Wl,-rpath=$BOOST_LIBDIR"
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+return 0;
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  molds_cv_ld_accepts_rpath=yes
+else
+  molds_cv_ld_accepts_rpath=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+               LDFLAGS=$LDFLAGS_save
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $molds_cv_ld_accepts_rpath" >&5
+$as_echo "$molds_cv_ld_accepts_rpath" >&6; }
+
+if test x$molds_cv_ld_accepts_rpath == xyes; then :
+  BOOST_LDFLAGS="$BOOST_LDFLAGS -Wl,-rpath=$BOOST_LIBDIR"
+fi
 
 for ac_header in boost/random.hpp
 do :