Add explicit check for Blas and Lapack to make --with-blas-lib and --…

…with-lapack-lib work correctly
coin-or · Feb 24, 2025 · 49ab312 · 49ab312
1 parent 5c9a9ee
commit 49ab312
Show file tree

Hide file tree

Showing 7 changed files with 7,683 additions and 698 deletions.
diff --git a/Clp/Makefile.in b/Clp/Makefile.in
@@ -189,6 +189,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
 COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
+COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
+COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
@@ -244,6 +246,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LAPACK_CFLAGS = @LAPACK_CFLAGS@
+LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
+LAPACK_DATA = @LAPACK_DATA@
+LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
+LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
+LAPACK_LIBS = @LAPACK_LIBS@
+LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@

diff --git a/Clp/configure b/Clp/configure
diff --git a/Clp/configure.ac b/Clp/configure.ac
@@ -56,6 +56,8 @@ AC_COIN_INIT_AUTO_TOOLS
 #                              COIN-OR components                           #
 #############################################################################
 
+AC_COIN_CHECK_PACKAGE_BLAS(ClpLib)
+AC_COIN_CHECK_PACKAGE_LAPACK(ClpLib)
 AC_COIN_CHECK_PACKAGE(CoinUtils, [coinutils], [ClpLib])
 if test $coin_has_coinutils != yes ; then
   AC_MSG_ERROR([Required package CoinUtils not available.])

diff --git a/Clp/src/Makefile.in b/Clp/src/Makefile.in
@@ -394,6 +394,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
 COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
+COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
+COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
@@ -449,6 +451,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LAPACK_CFLAGS = @LAPACK_CFLAGS@
+LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
+LAPACK_DATA = @LAPACK_DATA@
+LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
+LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
+LAPACK_LIBS = @LAPACK_LIBS@
+LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@

diff --git a/Clp/src/OsiClp/Makefile.in b/Clp/src/OsiClp/Makefile.in
@@ -168,6 +168,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
 COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
+COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
+COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
@@ -223,6 +225,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LAPACK_CFLAGS = @LAPACK_CFLAGS@
+LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
+LAPACK_DATA = @LAPACK_DATA@
+LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
+LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
+LAPACK_LIBS = @LAPACK_LIBS@
+LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@

diff --git a/Clp/src/config.h.in b/Clp/src/config.h.in
@@ -42,6 +42,9 @@
 /* Define to 1 if the Glpk package is available */
 #undef COIN_HAS_GLPK
 
+/* If defined, the LAPACK Library is available. */
+#undef COIN_HAS_LAPACK
+
 /* Define to 1 if the Mumps package is available */
 #undef COIN_HAS_MUMPS
 

diff --git a/Clp/test/Makefile.in b/Clp/test/Makefile.in
@@ -156,6 +156,8 @@ COIN_HAS_DOXYGEN_FALSE = @COIN_HAS_DOXYGEN_FALSE@
 COIN_HAS_DOXYGEN_TRUE = @COIN_HAS_DOXYGEN_TRUE@
 COIN_HAS_GLPK_FALSE = @COIN_HAS_GLPK_FALSE@
 COIN_HAS_GLPK_TRUE = @COIN_HAS_GLPK_TRUE@
+COIN_HAS_LAPACK_FALSE = @COIN_HAS_LAPACK_FALSE@
+COIN_HAS_LAPACK_TRUE = @COIN_HAS_LAPACK_TRUE@
 COIN_HAS_LATEX_FALSE = @COIN_HAS_LATEX_FALSE@
 COIN_HAS_LATEX_TRUE = @COIN_HAS_LATEX_TRUE@
 COIN_HAS_MUMPS_FALSE = @COIN_HAS_MUMPS_FALSE@
@@ -211,6 +213,13 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LAPACK_CFLAGS = @LAPACK_CFLAGS@
+LAPACK_CFLAGS_INSTALLED = @LAPACK_CFLAGS_INSTALLED@
+LAPACK_DATA = @LAPACK_DATA@
+LAPACK_DATA_INSTALLED = @LAPACK_DATA_INSTALLED@
+LAPACK_DEPENDENCIES = @LAPACK_DEPENDENCIES@
+LAPACK_LIBS = @LAPACK_LIBS@
+LAPACK_LIBS_INSTALLED = @LAPACK_LIBS_INSTALLED@
 LDFLAGS = @LDFLAGS@
 LIBEXT = @LIBEXT@
 LIBOBJS = @LIBOBJS@