com php-src: Fix odbc build as shared: ext/odbc/config.m4

From: Date: Mon, 09 Mar 2015 09:26:10 +0000
Subject: com php-src: Fix odbc build as shared: ext/odbc/config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85397@lists.php.net to get a copy of this message
Commit: 10d61a3a3e3087603dfbf45febaca2894a1f2344 Author: Remi Collet <remi@php.net> Sun, 8 Mar 2015 07:34:51 +0100 Committer: Julien Pauli <jpauli@php.net> Mon, 9 Mar 2015 10:26:10 +0100 Parents: e14401decad6794bc714c40877014546b9c99fd7 Branches: PHP-5.5.23 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=10d61a3a3e3087603dfbf45febaca2894a1f2344 Log: Fix odbc build as shared Broken since a41aa46759d20e23af92df00b917ca66c6102412 Changed paths: M ext/odbc/config.m4 Diff: diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index f79c461..9555efd 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 ])

« previous php.cvs (#85397) next »