diff options
| author | Remi Collet <remi@php.net> | 2015-03-08 07:37:07 +0100 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2015-03-08 07:37:07 +0100 |
| commit | 02808aeca3023a03c1abfd75d3d453d9bfaee3e8 (patch) | |
| tree | 1036ab13660d58a2c01f00923b5f9d0521b75f63 | |
| parent | b1cd381f011e2437a0ad57031ef92ede69f319b3 (diff) | |
| parent | 43da0d302bf50a62296759869b4102e5aafcb6c3 (diff) | |
| download | php-git-02808aeca3023a03c1abfd75d3d453d9bfaee3e8.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix odbc build as shared
| -rw-r--r-- | ext/odbc/config.m4 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 8b7864983f..50ad6e7aae 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -99,6 +99,11 @@ AC_DEFUN([PHP_ODBC_FIND_EMPRESS_BCS_LIBS],[ dnl dnl configure options dnl + +PHP_ARG_WITH(odbcver,, +[ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300. + Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300) + if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(adabas,, [ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) @@ -490,10 +495,6 @@ PHP_ARG_WITH(dbmaker,, fi fi -PHP_ARG_WITH(odbcver,, -[ --with-odbcver[=HEX] Force support for the passed ODBC version. A hex number is expected, default 0x0300. - Use the special value of 0 to prevent an explicit ODBCVER to be defined. ], 0x0300) - if test "no" != "$PHP_ODBCVER"; then if test "$PHP_ODBCVER" != "0"; then AC_DEFINE_UNQUOTED(ODBCVER, $PHP_ODBCVER, [ The highest supported ODBC version ]) |