keep DIR option to --with-unixODBC for old versions without libodbc.pc

diff --git a/UPGRADING b/UPGRADING
index 1335d2c4ae1f2edf98b7c72bf5bbbea50d65f8ae..2d63688969afa371ce3aea74de9604f2fbd1737b 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -563,7 +563,8 @@ The following extensions and SAPIs are affected:
 
 - ODBC:
   . --with-iodbc no longer accepts a directory.
-  . --with-unixODBC no longer accepts a directory.
+  . --with-unixODBC without directory now use pkg-config (preferred).
+    Directory is still accepted for old versions without libodbc.pc.
 
 - OpenSSL:
   . --with-openssl no longer accepts a directory.

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 1fdce146cd633306b57dc05ba4aa3bdd2668a733..ab0c55c247e74ed0f044ca0a47202ee5b74da57f 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -362,9 +362,20 @@ PHP_ARG_WITH([unixODBC],,
 
   AC_MSG_CHECKING(whether to build with unixODBC support)
   if test "$PHP_UNIXODBC" != "no"; then
-    AC_MSG_RESULT(yes)
-    PKG_CHECK_MODULES([ODBC], [odbc])
-    PHP_EVAL_INCLINE($ODBC_CFLAGS)
+    if test "$PHP_UNIXODBC" = "yes"; then
+      AC_MSG_RESULT(yes from pkgconfig)
+      PKG_CHECK_MODULES([ODBC], [odbc])
+      PHP_EVAL_INCLINE($ODBC_CFLAGS)
+    else
+      dnl keep old DIR way for old version without libodbc.pc
+      ODBC_INCDIR=$PHP_UNIXODBC/include
+      ODBC_LIBDIR=$PHP_UNIXODBC/$PHP_LIBDIR
+      ODBC_LFLAGS=-L$ODBC_LIBDIR
+      ODBC_CFLAGS=-I$ODBC_INCDIR
+      ODBC_LIBS=-lodbc
+      PHP_ODBC_CHECK_HEADER(sqlext.h)
+      AC_MSG_RESULT(yes in $PHP_UNIXODBC)
+    fi
     ODBC_TYPE=unixODBC
     AC_DEFINE(HAVE_UNIXODBC,1,[ ])
   else