Ignore:
Timestamp:
Dec 19, 2010 11:31:25 AM (10 years ago)
Author:
stefan
Message:

sync with trunk rev1920

Location:
ThirdParty/Glpk/stable/1.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/stable/1.7

  • ThirdParty/Glpk/stable/1.7/configure.ac

    r1867 r1922  
    6262glpkminorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
    6363AC_MSG_RESULT([${glpkmajorver}.${glpkminorver}])
    64 if test x$glpkmajorver != x4 || test x$glpkminorver != x44 ; then
    65   AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.44. Please update by rerunning get.GLPK"])
     64if test x$glpkmajorver != x4 || ( test x$glpkminorver != x44 && test x$glpkminorver != x45 ); then
     65  AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.44 or 4.45. Please update by rerunning get.GLPK"])
    6666fi
    6767AC_SUBST(glpkmajorver)
Note: See TracChangeset for help on using the changeset viewer.