Ignore:
Timestamp:
Nov 20, 2012 10:30:18 AM (7 years ago)
Author:
stefan
Message:

support glpk 4.47 now

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/configure.ac

    r2425 r2639  
    2121# List one file in the package so that the configure script can test
    2222# whether the package is actually there
    23 AC_CONFIG_SRCDIR(glpk/include/glpk.h)
     23AC_CONFIG_SRCDIR(glpk/src/glpk.h)
    2424
    2525# Where should everything be installed by default?  Here, we want it
     
    5959
    6060AC_MSG_CHECKING([GLPK version])
    61 glpkmajorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
    62 glpkminorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/include/glpk.h`
     61glpkmajorver=`awk '/define GLP_MAJOR_VERSION/ {print $3}' $srcdir/glpk/src/glpk.h`
     62glpkminorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/src/glpk.h`
    6363AC_MSG_RESULT([${glpkmajorver}.${glpkminorver}])
    64 if 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"])
     64if test x$glpkmajorver != x4 || test x$glpkminorver != x47 ; then
     65  AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.47. Please update by rerunning get.GLPK"])
    6666fi
    6767AC_SUBST(glpkmajorver)
     
    7373
    7474AC_LANG_PUSH(C)
    75 
    76 AC_COIN_CHECK_GNU_ZLIB(GLPK)
    77 if test $coin_has_zlib = "yes"; then
    78   AC_DEFINE([HAVE_ZLIB], [1], [Define to 1 if GNU zlib is available])
    79 fi
    8075
    8176AC_COIN_CHECK_GMP(Glpk)
Note: See TracChangeset for help on using the changeset viewer.