Changeset 2712

Timestamp:

Apr 6, 2013 8:46:02 AM (8 years ago)

Author:

stefan

Message:

sync with trunk rev 2711

Location:

ThirdParty/Glpk/stable/1.9

Files:

• . (modified) (1 prop)
• INSTALL.Glpk (modified) (1 diff)
• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• get.Glpk (modified) (1 diff)

ThirdParty/Glpk/stable/1.9/INSTALL.Glpk

@@ -14 +14 @@
 You may download
 
-ftp://ftp.gnu.org/gnu/glpk/glpk-4.47.tar.gz
+ftp://ftp.gnu.org/gnu/glpk/glpk-4.48.tar.gz
 
 and unpack it in this directory:
 
-gunzip glpk-4.47.tar.gz
-tar xf glpk-4.47.tar
+gunzip glpk-4.48.tar.gz
+tar xf glpk-4.48.tar
 
 Then you need to rename the directory
-  glpk-4.47
+  glpk-4.48
 into
   glpk

ThirdParty/Glpk/stable/1.9/configure

@@ -20150 +20150 @@
 echo "$as_me:$LINENO: result: ${glpkmajorver}.${glpkminorver}" >&5
 echo "${ECHO_T}${glpkmajorver}.${glpkminorver}" >&6
-if test x$glpkmajorver != x4 || test x$glpkminorver != x47 ; then
-  { { echo "$as_me:$LINENO: error: \"Incorrect GLPK version. This build system is made for GLPK 4.47. Please update by rerunning get.GLPK\"" >&5
-echo "$as_me: error: \"Incorrect GLPK version. This build system is made for GLPK 4.47. Please update by rerunning get.GLPK\"" >&2;}
+if test x$glpkmajorver != x4 || test x$glpkminorver != x48 ; then
+  { { echo "$as_me:$LINENO: error: \"Incorrect GLPK version. This build system is made for GLPK 4.48. Please update by rerunning get.GLPK\"" >&5
+echo "$as_me: error: \"Incorrect GLPK version. This build system is made for GLPK 4.48. Please update by rerunning get.GLPK\"" >&2;}
    { (exit 1); exit 1; }; }
 fi

ThirdParty/Glpk/stable/1.9/configure.ac

@@ -62 +62 @@
 glpkminorver=`awk '/define GLP_MINOR_VERSION/ {print $3}' $srcdir/glpk/src/glpk.h`
 AC_MSG_RESULT([${glpkmajorver}.${glpkminorver}])
-if test x$glpkmajorver != x4 || test x$glpkminorver != x47 ; then
-  AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.47. Please update by rerunning get.GLPK"])
+if test x$glpkmajorver != x4 || test x$glpkminorver != x48 ; then
+  AC_MSG_ERROR(["Incorrect GLPK version. This build system is made for GLPK 4.48. Please update by rerunning get.GLPK"])
 fi
 AC_SUBST(glpkmajorver)

ThirdParty/Glpk/stable/1.9/get.Glpk

@@ -2 +2 @@
 
 set -e
-glpk_ver=4.47
+glpk_ver=4.48
 
 wgetcmd=wget