Commit: c99418b0ce2826fc4926b87738da41fa358fcf66 - MolDS (git)

Commit MetaInfo

• Revision: c99418b0ce2826fc4926b87738da41fa358fcf66 (tree)
• Zeit: 2013-08-24 11:01:21
• 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@1509 1136aad2-a195-0410-b898-f5ea1d11b9d8

Ändern Zusammenfassung

• modified: src/config.h.in
• modified: src/configure

Diff

--- a/src/config.h.in
+++ b/src/config.h.in
@@ -155,6 +155,9 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
+/* Whether ILP64 version of Intel Math Kernel Library */
+#undef MKL_ILP64
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 

--- a/src/configure
+++ b/src/configure
@@ -7690,6 +7690,11 @@ _ACEOF
 
 $as_echo "#define SIZEOF_LAPACKINT SIZEOF_BLASINT" >>confdefs.h
 
+if test x$molds_cv_sizeof_blasint = x64; then :
+
+$as_echo "#define MKL_ILP64 /**/" >>confdefs.h
+
+fi
 
 
 
@@ -8505,6 +8510,52 @@ fi
     	LDFLAGS="$LDFLAGS_SAVED"
 	fi
 
+
+{ $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
+               LIBS_save=$LIBS
+               LDFLAGS="-Wl,-rpath=$BOOST_LIBDIR"
+               LIBS=""
+               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#ifdef F77_DUMMY_MAIN
+
+#  ifdef __cplusplus
+     extern "C"
+#  endif
+   int F77_DUMMY_MAIN() { return 1; }
+
+#endif
+int
+main ()
+{
+return 0;
+  ;
+  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
+               LIBS=$LIBS_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
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler implements namespaces" >&5
 $as_echo_n "checking whether the compiler implements namespaces... " >&6; }
 if ${ac_cv_cxx_namespaces+:} false; then :
@@ -8568,7 +8619,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 CXXFLAGS_SAVE=$CXXFLAGS
 LIBS_SAVE=$LIBS
-CXXFLAGS="-pthread $CXXFLAGS"
+CXXFLAGS="$BOOST_CPPFLAGS -pthread $CXXFLAGS $BOOST_LDFLAGS"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Boost::Thread library is available" >&5
 $as_echo_n "checking whether the Boost::Thread library is available... " >&6; }
@@ -8718,8 +8769,7 @@ boost::thread_group thrds; return 0;
 
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS -lboost_system"
-                        ax_cv_boost_thread_system=yes
+  ax_cv_boost_thread_system=yes
 else
   as_fn_error $? "Cannot use Boost::Thread" "$LINENO" 5
 
@@ -8734,6 +8784,10 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_boost_thread_system" >&5
 $as_echo "$ax_cv_boost_thread_system" >&6; }
 
+  if test "x$ax_cv_boost_thread_system" = "xyes"; then
+     BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS -lboost_system"
+  fi
+
   CXXFLAGS=$CXXFLAGS_SAVE
   LIBS=$LIBS_SAVE
   ac_ext=cpp
@@ -8747,51 +8801,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 fi
 
 
-{ $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
-               LIBS_save=$LIBS
-               LDFLAGS="-Wl,-rpath=$BOOST_LIBDIR"
-               LIBS=""
-               cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#ifdef F77_DUMMY_MAIN
-
-#  ifdef __cplusplus
-     extern "C"
-#  endif
-   int F77_DUMMY_MAIN() { return 1; }
-
-#endif
-int
-main ()
-{
-return 0;
-  ;
-  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
-               LIBS=$LIBS_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
-
 CPPFLAGS_save=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
 for ac_header in boost/format.hpp