Changeset 1179 for ThirdParty/Glpk/stable/1.4/configure.ac

Timestamp:

Sep 14, 2008 7:43:37 AM (13 years ago)

Author:

stefan

Message:

synchronize with trunk rev. 1177 (update to glpk 4.31)

File:

• ThirdParty/Glpk/stable/1.4/configure.ac (modified) (1 diff)

ThirdParty/Glpk/stable/1.4/configure.ac

@@ -70 +70 @@
 if test x"$use_thirdpartyglpk" = xbuild ; then
   touch $MAKEOKFILE
+  #CoinUtils and SYMPHONY include glpmpl.h and have HAVE_CONFIG_H defined
+  #so we put a dummy config.h file into the glpk include directory
+  touch ${GLPKINCDIR}/config.h
   AC_MSG_CHECKING([GLPK version])
   majorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
   minorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' ${GLPKINCDIR}/glpk.h`
   AC_MSG_RESULT([${majorver}.${minorver}])
-  if test $majorver != 4 || test $minorver != 30 ; then
-    AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.30. Please update by rerunning get.GLPK"])
+  if test $majorver != 4 || test $minorver != 31 ; then
+    AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.31. Please update by rerunning get.GLPK"])
   fi
 else