diff options
| author | Remi Collet <remi@php.net> | 2019-06-05 10:56:05 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2019-06-05 10:56:10 +0200 |
| commit | 8f854c109927019192721a890ed7f201db1e2f87 (patch) | |
| tree | 2e14fb64869745e6d39a1d0fd7418eb6d699e302 | |
| parent | ac9ce0f895c285a01052eae6accc37ece25090fa (diff) | |
| download | php-git-8f854c109927019192721a890ed7f201db1e2f87.tar.gz | |
keep DIR option to --with-unixODBC for old versions without libodbc.pc
| -rw-r--r-- | UPGRADING | 3 | ||||
| -rw-r--r-- | ext/odbc/config.m4 | 17 |
2 files changed, 16 insertions, 4 deletions
@@ -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 |