From: Remi Collet <remi@php.net>
Date: Wed, 5 Jun 2019 08:56:05 +0000 (+0200)
Subject: keep DIR option to --with-unixODBC for old versions without libodbc.pc
X-Git-Tag: php-7.4.0alpha1~85
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f854c109927019192721a890ed7f201db1e2f87;p=php

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

diff --git a/UPGRADING b/UPGRADING
index 1335d2c4ae..2d63688969 100644
--- 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 1fdce146cd..ab0c55c247 100644
--- 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