archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Autotools: Simplify PHP_PDO_DBLIB conditions

Browse source 
The PHP_PDO_DBLIB value no is already checked in the main if sentence.
This commit is contained in:
Peter Kokot 2024-08-17 15:10:10 +02:00
parent b2640ee7f7
commit 0064c42215
No known key found for this signature in database
GPG key ID: A94800907AA79B36
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/pdo_dblib/config.m4
View file

@ -4,14 +4,14 @@ PHP_ARG_WITH([pdo-dblib],
[PDO: DBLIB-DB support. DIR is the FreeTDS home directory])]) [PDO: DBLIB-DB support. DIR is the FreeTDS home directory])])
if test "$PHP_PDO_DBLIB" != "no"; then if test "$PHP_PDO_DBLIB" != "no"; then
if test "$PHP_PDO_DBLIB" = "yes"; then AS_VAR_IF([PHP_PDO_DBLIB], [yes], [
dnl FreeTDS must be on the default system include/library path. dnl FreeTDS must be on the default system include/library path.
dnl Only perform a sanity check that this is really the case. dnl Only perform a sanity check that this is really the case.
PHP_CHECK_LIBRARY([sybdb], [dbsqlexec], PHP_CHECK_LIBRARY([sybdb], [dbsqlexec],
[], [],
[AC_MSG_FAILURE([Cannot find FreeTDS in known installation directories.])]) [AC_MSG_FAILURE([Cannot find FreeTDS in known installation directories.])])
PHP_ADD_LIBRARY([sybdb],, [PDO_DBLIB_SHARED_LIBADD]) PHP_ADD_LIBRARY([sybdb],, [PDO_DBLIB_SHARED_LIBADD])
elif test "$PHP_PDO_DBLIB" != "no"; then ], [
if test -f $PHP_PDO_DBLIB/include/sybdb.h; then if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
@ -32,7 +32,7 @@ if test "$PHP_PDO_DBLIB" != "no"; then
PHP_ADD_LIBRARY_WITH_PATH([sybdb], PHP_ADD_LIBRARY_WITH_PATH([sybdb],
[$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR], [$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR],
[PDO_DBLIB_SHARED_LIBADD]) [PDO_DBLIB_SHARED_LIBADD])
fi ])
PHP_CHECK_PDO_INCLUDES PHP_CHECK_PDO_INCLUDES