Changeset 2543

Timestamp:

Feb 12, 2012 10:16:35 AM (9 years ago)

Author:

stefan

Message:

add public define COINHSL_HAS_METIS

Location:

ThirdParty/HSL/trunk

Files:

• config.h.in (modified) (1 diff)
• config_coinhsl.h.in (modified) (1 diff)
• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)

ThirdParty/HSL/trunk/config.h.in

@@ -24 +24 @@
 /* Define to 1 if MC68 is available. */
 #undef COINHSL_HAS_MC68
+
+/* Define to 1 if METIS is available */
+#undef COINHSL_HAS_METIS
 
 /* SVN revision number of project */

ThirdParty/HSL/trunk/config_coinhsl.h.in

@@ -28 +28 @@
 #undef COINHSL_HAS_MC68
 
+/* Define to 1 if METIS is available */
+#undef COINHSL_HAS_METIS
+
 /* Version number of project */
 #undef COINHSL_VERSION

ThirdParty/HSL/trunk/configure

@@ -26231 +26231 @@
 
 
+  if test $coin_has_metis = yes ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define COINHSL_HAS_METIS 1
+_ACEOF
+
+  fi
 else
   # do as if we had metis, so metis.f is not compiled

ThirdParty/HSL/trunk/configure.ac

@@ -174 +174 @@
 if test $coin_has_ma57$coin_has_hsl_ma77$coin_has_hsl_mc68 != nonono ; then
   AC_COIN_CHECK_PACKAGE(Metis, [coinmetis], HSL)
+  if test $coin_has_metis = yes ; then
+    AC_DEFINE(COINHSL_HAS_METIS, [1], Define to 1 if METIS is available)
+  fi
 else
   # do as if we had metis, so metis.f is not compiled