From: foobar <sniper@php.net>
Date: Fri, 29 Jul 2005 19:41:01 +0000 (+0000)
Subject: - Fixed bug #33837 (Informix ESQL version numbering schema changed)
X-Git-Tag: RELEASE_2_0_0~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bb094e52b2a93e6789879cb65356b5ff099c2b4;p=php

- Fixed bug #33837 (Informix ESQL version numbering schema changed)
---

diff --git a/ext/informix/config.m4 b/ext/informix/config.m4
index 0dddc6d64e..bbad564fdd 100644
--- a/ext/informix/config.m4
+++ b/ext/informix/config.m4
@@ -44,8 +44,20 @@ if test "$PHP_INFORMIX" != "no"; then
   esac
 
   AC_MSG_CHECKING([Informix version])
+  IFX_IBM_VERSION=[`$INFORMIXDIR/bin/esql -V | grep "IBM Informix-ESQL Version" | sed -ne '1 s/\(.*\)ESQL Version \([0-9]*\)\.\([0-9]*\).*/\2\3/p'`]
   IFX_VERSION=[`$INFORMIXDIR/bin/esql -V | grep "ESQL Version" | sed -ne '1 s/\(.*\)ESQL Version \([0-9]*\)\.\([0-9]*\).*/\2\3/p'`]
-  AC_MSG_RESULT($IFX_VERSION)
+
+  if test "$IFX_IBM_VERSION"; then
+    if test $IFX_IBM_VERSION -ge "290" && test $IFX_IBM_VERSION -lt "300"; then
+      IFX_VERSION=960
+    else
+      IFX_VERSION=$IFX_IBM_VERSION
+    fi
+    AC_MSG_RESULT([IBM: $IFX_VERSION])
+  else
+    AC_MSG_RESULT([$IFX_VERSION])
+  fi
+
   AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ])
 
   if test $IFX_VERSION -ge "900"; then