Changeset 969

Timestamp:

Oct 14, 2007, 1:57:41 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Addresses #118. ATLAS is now detected, see ticket comments for more info.

File:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -42 +42 @@
 # Set default programming language
 AC_LANG(C++)
+# reset CXXFLAGS, it has "-g -O2" as default
+CXXFLAGS=""
 
 # Checks for programs.
@@ -53 +55 @@
 # Checks for libraries.
 AC_CHECK_LIB(m,main)
-AC_SEARCH_LIBS(ATL_ctrsv,atlas,,
-  AC_SEARCH_LIBS(cblas_sdsdot,gslcblas))
+# searching for cblas. Priority 1) find a cblas library, 2) find ATLAS
+# generated cblas, and 3) fall back to GSL cblas implementation. If
+# partial ATLAS is detected the configure script fails.
+AC_SEARCH_LIBS(cblas_sdsdot,cblas,,
+  AC_SEARCH_LIBS(ATL_sdsdot,atlas,
+    AC_SEARCH_LIBS(cblas_sdsdot,cblas,[CXXFLAGS="$CXXFLAGS -m64" LDFLAGS="$LDFLAGS -m64"],
+      AC_MSG_ERROR(partial ATLAS library detected!),-m64),
+                            AC_SEARCH_LIBS(cblas_sdsdot,gslcblas),-m64))
 AC_CHECK_LIB(gsl,main)
 
@@ -77 +85 @@
 AC_CHECK_FUNCS([pow sqrt])
 
-CXXFLAGS="-Wall -pedantic"
+CXXFLAGS="$CXXFLAGS -Wall -pedantic"
 CPPFLAGS="-DHAVE_INLINE=1"
 AC_ARG_ENABLE(debug,
@@ -176 +184 @@
 AC_MSG_NOTICE([  CXXFLAGS=\"$CXXFLAGS\"])
 AC_MSG_NOTICE([  LIBS=\"$LIBS\"])
+AC_MSG_NOTICE([  LDFLAGS=\"$LDFLAGS\"])
 AC_MSG_NOTICE([ +++++++++++++++++++++++++++++++++++++++++++++++])
 AC_MSG_NOTICE([])