cvs: php-src(PHP_5_3) /ext/pdo_odbc config.m4
| From: | Wez Furlong | Date: | Mon, 08 Oct 2007 17:55:40 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/pdo_odbc config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-46549@lists.php.net to get a copy of this message | ||
wez Mon Oct 8 17:55:40 2007 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo_odbc config.m4
Log:
add iODBC support to pdo_odbc
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_odbc/config.m4?r1=1.22.2.1.2.3&r2=1.22.2.1.2.3.2.1&diff_format=u
Index: php-src/ext/pdo_odbc/config.m4
diff -u php-src/ext/pdo_odbc/config.m4:1.22.2.1.2.3 php-src/ext/pdo_odbc/config.m4:1.22.2.1.2.3.2.1
--- php-src/ext/pdo_odbc/config.m4:1.22.2.1.2.3 Mon Jul 9 12:35:44 2007
+++ php-src/ext/pdo_odbc/config.m4 Mon Oct 8 17:55:40 2007
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.22.2.1.2.3 2007/07/09 12:35:44 jani Exp $
+dnl $Id: config.m4,v 1.22.2.1.2.3.2.1 2007/10/08 17:55:40 wez Exp $
dnl config.m4 for extension pdo_odbc
dnl vim:et:sw=2:ts=2:
@@ -7,7 +7,7 @@
define([PDO_ODBC_HELP_TEXT],[[
include and lib dirs are looked for under 'dir'.
- 'flavour' can be one of: ibm-db2, unixODBC, generic
+ 'flavour' can be one of: ibm-db2, iODBC, unixODBC, generic
If ',dir' part is omitted, default for the flavour
you have selected will used. e.g.:
@@ -72,6 +72,12 @@
pdo_odbc_def_lib=db2
;;
+ iODBC|iodbc)
+ pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
+ pdo_odbc_def_incdir=/usr/local/include
+ pdo_odbc_def_lib=iodbc
+ ;;
+
unixODBC|unixodbc)
pdo_odbc_def_libdir=/usr/local/$PHP_LIBDIR
pdo_odbc_def_incdir=/usr/local/include
@@ -149,7 +155,7 @@
[], [
AC_MSG_ERROR([
Your ODBC library does not appear to be ODBC 3 compatible.
-You should consider using unixODBC instead, and loading your
+You should consider using iODBC or unixODBC instead, and loading your
libraries as a driver in that environment; it will emulate the
functions required for PDO support.
])], $PDO_ODBC_LDFLAGS)