blob: d8080bf03329861e6fd619d1f5b06cee59a37e47 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From d3757f6620cc101c2c1e5935e2cc1cfbbcd3e658 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 29 May 2019 12:13:01 +0200
Subject: [PATCH] keep DIR option to --with-unixODBC for old versions without
libodbc.pc
---
ext/odbc/config.m4 | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 1fdce146cd63..ab0c55c247e7 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
|
