From 4151cda15de59793593cd897e862744e0fbd15ec Mon Sep 17 00:00:00 2001
From: jiri <jiri>
Date: Sat, 30 Mar 2019 17:01:03 +0000
Subject: [PATCH] *** empty log message ***

---
 Makefile.am  | 25 +++++++++++++++----------
 configure.ac |  9 +++++----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e8795e7..e27a4e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,16 +14,21 @@ EXTRA_DIST = LICENSE doxygen.cfg aminclude.am acinclude.m4 footer.html
 #todo: achieve portability of the fortran calls via autoconf?
 
 #use ./configure CXXFLAGS="" LDFLAGS="" to avoid defaults
-CXXFLAGS += -g 
-CXXFLAGS += $(OPTIMIZEOPT) $(CUDAOPT) $(FORINTOPT) $(DEBUGOPT) $(MATPTROPT)
-CXXFLAGS += -DNO_STRASSEN -DFORTRAN_
 
-CXXFLAGS += $(CBLASOPT) $(CLAPACKOPT)
-LDFLAGS += $(CBLASLIB)
-LDFLAGS += $(BLASLIB)
-LDFLAGS += $(ATLASLIB)
-CXXFLAGS += $(TRACEBACKOPT)
-LDFLAGS += $(CUDALIBS)
-LDFLAGS += $(TRACEBACKLIB)
+AM_LDFLAGS=
+AM_CXXFLAGS=
+
+AM_CXXFLAGS += -g 
+AM_CXXFLAGS += $(OPTIMIZEOPT) $(CUDAOPT) $(FORINTOPT) $(DEBUGOPT) $(MATPTROPT)
+AM_CXXFLAGS += -DNO_STRASSEN -DFORTRAN_
+
+AM_CXXFLAGS += $(CBLASOPT) $(CLAPACKOPT)
+AM_CXXFLAGS += $(TRACEBACKOPT)
+#AM_LDFLAGS += .libs/libla.a
+AM_LDFLAGS += $(CBLASLIB)
+AM_LDFLAGS += $(BLASLIB)
+AM_LDFLAGS += $(ATLASLIB)
+AM_LDFLAGS += $(CUDALIBS)
+AM_LDFLAGS += $(TRACEBACKLIB)
 
 include $(top_srcdir)/aminclude.am
diff --git a/configure.ac b/configure.ac
index d6a85bd..3920212 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,9 +2,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([libla], [0.6], [jiri@pittnerovi.com])
+AC_INIT([libla], [0.8], [jiri@pittnerovi.com])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
+AM_PROG_AR
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 LT_INIT
 
@@ -19,12 +20,12 @@ AC_LANG(C++)
 
 # Checks for mandatory libraries.
 ATLASLIB=""	
-AC_CHECK_LIB([atlas], [ATL_zgemv],ATLASLIB=-latlas, [
+AC_CHECK_LIB([atlas], [ATL_zgemv],ATLASLIB="-lblas -latlas", [
         echo "ATLAS not found, I hope you are using some other (more) efficient BLAS!"
         ])
 AC_SUBST([ATLASLIB])
 
-AC_CHECK_LIB([blas], [dgemm_],BLASLIB=-lblas, [
+AC_CHECK_LIB([blas], [dgemm_],BLASLIB="-lblas", [
         echo ERROR: BLAS not found! You have to install the BLAS library.
         exit
         ],[$ATLASLIB])
@@ -42,7 +43,7 @@ AC_ARG_ENABLE([matptr],[  --enable-matptr   switch to double** matrix representa
 
 
 #cblas and clapack available?
-AC_CHECK_LIB([cblas], [cblas_ddot], [CBLASLIB=-lcblas], [CBLASOPT=-DNONCBLAS],[$ATLASLIB])
+AC_CHECK_LIB([cblas], [cblas_ddot], [CBLASLIB="-lcblas"], [CBLASOPT=-DNONCBLAS],[$ATLASLIB])
 AC_CHECK_HEADER([cblas.h],,[CBLASOPT=-DNONCBLAS CBLASLIB=""], AC_INCLUDES_DEFAULT)
 AC_SUBST([CBLASLIB])
 AC_SUBST([CBLASOPT])