Changeset ec4e84

Timestamp:

Sep 9, 2008, 7:46:15 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

79cd79

Parents:

03c204

Message:

configure BUGFIX: GSL may be linked against cblas_... functions or just ..., this is fixed.

Before we checked for cblas_dnrm2. However, e.g. libgoto names it simply dnrm2. Hence, the blas functions are not found or slower (c)blas, or gsl(c)blas is used. Now, we simply check for dnrm2 functions in the list of libs first, if it fails, then for cblas_dnrm2. And finally, we test GSL functionality by checking for main(), which only works if a working blas lib has been found before.
Also, we removed AC_MSG_NOTICE about CFLAGS and others. However, the other for MPICC was left present.

Files:

• molecuilder/configure.ac (modified) (2 diffs)
• pcp/configure.ac (modified) (2 diffs)
• util/configure.ac (modified) (1 diff)

molecuilder/configure.ac

@@ -43 +43 @@
 # Checks for library functions.
 # check for GNU Scientific Library
-AC_SEARCH_LIBS(cblas_sdot, blas cblas gslblas gslcblas)
-AC_CHECK_LIB(gsl,main)
+AC_CHECK_HEADERS([gsl/gsl_blas.h])
+AC_SEARCH_LIBS(dnrm2, goto blas cblas gslblas gslcblas)
+AC_CHECK_LIB(gsl, main, [], 
+        [AC_SEARCH_LIBS(cblas_dnrm2, blas cblas gslblas gslcblas)])
+AC_CHECK_LIB(gsl, gsl_blas_dnrm2, , [AC_MSG_ERROR(["No working BLAS found for GSL, stopping."])])
 
 # add replacement/saturation hydrogen or not 
@@ -70 +73 @@
 fi
 
-AC_MSG_NOTICE(["CFLAGS: $CFLAGS, CXXFLAGS: $CXXFLAGS, LDFLAGS: $LDFLAGS, CC: $CC, CXX:, $CXX, MPICC: $MPICC, MPILIBS: $MPILIBS, LIBS: $LIBS"])
+#AC_MSG_NOTICE(["CFLAGS: $CFLAGS, CXXFLAGS: $CXXFLAGS, LDFLAGS: $LDFLAGS, CC: $CC, CXX:, $CXX, MPICC: $MPICC, MPILIBS: $MPILIBS, LIBS: $LIBS"])
 
 # test suite

pcp/configure.ac

@@ -172 +172 @@
 #AC_CHECK_LIB(m,main)
 AC_CHECK_HEADERS([gsl/gsl_blas.h])
-AC_SEARCH_LIBS(cblas_sdot, blas cblas gslblas gslcblas)
-AC_CHECK_LIB(gsl, main)
+AC_SEARCH_LIBS(dnrm2, goto blas cblas gslblas gslcblas)
+AC_CHECK_LIB(gsl, main, [], 
+        [AC_SEARCH_LIBS(cblas_dnrm2, blas cblas gslblas gslcblas)])
+AC_CHECK_LIB(gsl, gsl_blas_dnrm2, , [AC_MSG_ERROR(["No working BLAS found for GSL, stopping."])])
 
 dnl Check for "extern inline", using a modified version
@@ -192 +194 @@
 fi
 
-AC_MSG_NOTICE(["CFLAGS: $CFLAGS, CXXFLAGS: $CXXFLAGS, LDFLAGS: $LDFLAGS, CC: $CC, CXX:, $CXX, MPICC: $MPICC, MPILIBS: $MPILIBS, LIBS: $LIBS"])
+#AC_MSG_NOTICE(["CFLAGS: $CFLAGS, CXXFLAGS: $CXXFLAGS, LDFLAGS: $LDFLAGS, CC: $CC, CXX:, $CXX, MPICC: $MPICC, MPILIBS: $MPILIBS, LIBS: $LIBS"])
 
 # test suite

util/configure.ac

@@ -38 +38 @@
 AC_CHECK_LIB(m, sqrt, ,AC_MSG_ERROR([compatible libc math library not found]))
 # check for GNU Scientific Library
-AC_SEARCH_LIBS(cblas_sdot, blas cblas gslblas gslcblas)
-AC_CHECK_LIB(gsl,main)
+AC_CHECK_HEADERS([gsl/gsl_blas.h])
+AC_SEARCH_LIBS(dnrm2, goto blas cblas gslblas gslcblas)
+AC_CHECK_LIB(gsl, main, [], 
+        [AC_SEARCH_LIBS(cblas_dnrm2, blas cblas gslblas gslcblas)])
+AC_CHECK_LIB(gsl, gsl_blas_dnrm2, , [AC_MSG_ERROR(["No working BLAS found for GSL, stopping."])])
 
-AC_MSG_NOTICE(["CFLAGS: $CFLAGS, CXXFLAGS: $CXXFLAGS, LDFLAGS: $LDFLAGS, CC: $CC, CXX:, $CXX, MPICC: $MPICC, MPILIBS: $MPILIBS, LIBS: $LIBS"])
+#AC_MSG_NOTICE(["CFLAGS: $CFLAGS, CXXFLAGS: $CXXFLAGS, LDFLAGS: $LDFLAGS, CC: $CC, CXX:, $CXX, MPICC: $MPICC, MPILIBS: $MPILIBS, LIBS: $LIBS"])
 
 # test suite