From: Antony Dovgal <tony2001@php.net>
Date: Mon, 4 Apr 2005 10:52:19 +0000 (+0000)
Subject: MFH: configure looks for incorrect db2 library
X-Git-Tag: php-5.0.5RC1~490
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bac150263bce77556e01ef64d0a8d4a9e2d630f7;p=php

MFH: configure looks for incorrect db2 library
---

diff --git a/NEWS b/NEWS
index 362fc474ad..32685ef96c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,13 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2005, PHP 5.0.5
+- Fixed bug #32560 (configure looks for incorrect db2 library). (Tony)
 - Fixed bug #32530 (chunk_split() does not append endstr if chunklen is  
   longer then the original string). (Ilia)
 - Fixed bug #28839 (SIGSEGV in interactive mode (php -a)).
   (kameshj at fastmail dot fm)
 
+
 31 Mar 2005, PHP 5.0.4
 - Added SNMPv2 support. (harrie)
 - Added Oracle Instant Client support. (cjbj at hotmail dot com, Tony)
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index e3ad2b107f..630f533ea1 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -199,17 +199,23 @@ AC_ARG_WITH(ibm-db2,
       AC_MSG_ERROR([IBM DB2 header files not found])
     fi
 
-    if ! test -f "$ODBC_LIBDIR/libdb2.so"; then
-      AC_MSG_ERROR([IBM DB2 required libraries not found])
-    fi
-	
     ODBC_INCLUDE=-I$ODBC_INCDIR
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_TYPE=db2
     ODBC_LIBS=-ldb2
-    AC_DEFINE(HAVE_IBMDB2,1,[ ])
 
-    AC_MSG_RESULT(yes)
+    PHP_TEST_BUILD(SQLExecute, [
+      AC_DEFINE(HAVE_IBMDB2,1,[ ])
+      AC_MSG_RESULT(yes)
+    ],
+    [
+      AC_MSG_RESULT(no)
+      AC_MSG_ERROR([build test failed. Please check the config.log for details.])
+    ],
+    [
+      $ODBC_LFLAGS $ODBC_LIBS
+    ])
+
   else
     AC_MSG_RESULT(no)
   fi