diff options
author | foobar <sniper@php.net> | 2001-06-01 05:02:32 +0000 |
---|---|---|
committer | foobar <sniper@php.net> | 2001-06-01 05:02:32 +0000 |
commit | 8fd4280b4ad40935c6eec12bc0bb144896d22e8b (patch) | |
tree | ae41c30be2654a4b4a3eed2799928216879b62bd | |
parent | 82bf518039afa3024300b1039c9dcda75fe2c91e (diff) | |
download | php-git-8fd4280b4ad40935c6eec12bc0bb144896d22e8b.tar.gz |
MFH
-rw-r--r-- | ext/odbc/config.m4 | 11 | ||||
-rw-r--r-- | ext/odbc/php_odbc.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 515bf50a63..cad7c443bb 100644 --- a/ext/odbc/config.m4 +++ b/ext/odbc/config.m4 @@ -1,3 +1,5 @@ +dnl $Id$ + dnl dnl Figure out which library file to link with for the Solid support. dnl @@ -366,6 +368,9 @@ AC_ARG_WITH(iodbc, PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) PHP_ADD_INCLUDE($withval/include) ODBC_TYPE=iodbc + ODBC_INCLUDE=-I$withval/include + ODBC_LFLAGS=-L$withval/lib + ODBC_LIBS=-liodbc AC_DEFINE(HAVE_IODBC,1,[ ]) AC_MSG_RESULT(yes) else @@ -533,10 +538,10 @@ if test -n "$ODBC_TYPE"; then fi AC_DEFINE(HAVE_UODBC,1,[ ]) PHP_SUBST(ODBC_INCDIR) - PHP_SUBST(ODBC_INCLUDE) PHP_SUBST(ODBC_LIBDIR) - PHP_SUBST(ODBC_LIBS) - PHP_SUBST(ODBC_LFLAGS) + PHP_SUBST_OLD(ODBC_INCLUDE) + PHP_SUBST_OLD(ODBC_LIBS) + PHP_SUBST_OLD(ODBC_LFLAGS) PHP_SUBST_OLD(ODBC_TYPE) PHP_EXTENSION(odbc, $shared) fi diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index cb3fe5e8bb..6fee2a6f42 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -259,6 +259,8 @@ static PHP_INI_DISP(display_defPW) #else PUTS("********"); #endif + } else { + PUTS("<i>no value</i>"); } } |