Commit: e35edf26f7c1eb09b48498d683dbf264df600aed - MolDS (git)

Commit MetaInfo

• Revisão: e35edf26f7c1eb09b48498d683dbf264df600aed (tree)
• Hora: 2013-01-02 03:45:35
• Autor: Katsuhiko Nishimra <ktns.87@gmai...>
• Commiter: Katsuhiko Nishimra

Mensagem de Log

Generate files by autoreconf 2.69 with automake 1.11.6. #28588

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

Mudança Sumário

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

Diff

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -52,10 +52,6 @@ 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@	$(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 \
@@ -175,7 +171,6 @@ LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
-OPENBLAS_ROOT = @OPENBLAS_ROOT@
 OPENMP_CXXFLAGS = @OPENMP_CXXFLAGS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -282,10 +277,8 @@ MolDS_SOURCES = Main.cpp base/MolDSException.cpp wrappers/Blas.cpp \
 
 ACLOCAL_AMFLAGS = -I m4
 AM_CXXFLAGS = $(OPENMP_CXXFLAGS)
-AM_CPPFLAGS = $(am__append_1)
-AM_LDFLAGS = $(am__append_2)
-@USE_OPENBLAS_DIR_TRUE@OPENBLAS_INCLUDE_DIR = $(OPENBLAS_ROOT)/include
-@USE_OPENBLAS_DIR_TRUE@OPENBLAS_LIB_DIR = $(OPENBLAS_ROOT)/lib
+AM_CPPFLAGS = $(BOOST_CPPLAGS)
+AM_LDFLAGS = $(BOOST_LDFLAGS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 

--- a/src/configure
+++ b/src/configure
@@ -639,9 +639,6 @@ build_os
 build_vendor
 build_cpu
 build
-OPENBLAS_ROOT
-USE_OPENBLAS_DIR_FALSE
-USE_OPENBLAS_DIR_TRUE
 OPENMP_CXXFLAGS
 EGREP
 GREP
@@ -4955,8 +4952,10 @@ 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
+                             BLAS_LIBS=-lopenblas
+                             OPENBLAS_ROOT=$withval
+                             CPPFLAGS="$CPPFLAGS -I$OPENBLAS_ROOT/include"
+                             LDFLAGS="$LDFLAGS -L$OPENBLAS_ROOT/lib"
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -4968,15 +4967,6 @@ else
   OPENBLAS_ROOT=
 fi
 
- if test x != x$OPENBLAS_ROOT; then
-  USE_OPENBLAS_DIR_TRUE=
-  USE_OPENBLAS_DIR_FALSE='#'
-else
-  USE_OPENBLAS_DIR_TRUE='#'
-  USE_OPENBLAS_DIR_FALSE=
-fi
-
-
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -8036,10 +8026,6 @@ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_OPENBLAS_DIR_TRUE}" && test -z "${USE_OPENBLAS_DIR_FALSE}"; then
-  as_fn_error $? "conditional \"USE_OPENBLAS_DIR\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0