diff options
| author | foobar <sniper@php.net> | 2001-06-01 05:02:13 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-06-01 05:02:13 +0000 |
| commit | 58d35ea7785c9f9a7008c6bce7b75e64bed979cc (patch) | |
| tree | c2fd6b9a75320cff2d03ac6c0834a03d508da89b /ext/odbc/config.m4 | |
| parent | 328258ac08f5554056205a6c8851e9f7bce1af4a (diff) | |
| download | php-git-58d35ea7785c9f9a7008c6bce7b75e64bed979cc.tar.gz | |
Missing entries in phpinfo() output
Diffstat (limited to 'ext/odbc/config.m4')
| -rw-r--r-- | ext/odbc/config.m4 | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4 index 7eec6fd70a..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 @@ -98,8 +100,8 @@ AC_ARG_WITH(adabas, if test "$withval" != "no"; then PHP_ADD_INCLUDE($withval/incl) PHP_ADD_LIBPATH($withval/lib) - ODBC_OBJS=$withval/lib/odbclib.a - ODBC_LIB=$abs_builddir/ext/odbc/libodbc_adabas.a + ODBC_OBJS="$withval/lib/odbclib.a" + ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" $srcdir/build/shtool mkdir -f -p ext/odbc rm -f "$ODBC_LIB" cp "$ODBC_OBJS" "$ODBC_LIB" @@ -194,7 +196,7 @@ AC_ARG_WITH(ibm-db2, ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_TYPE=db2 - ODBC_LIBS=-ldb2 + ODBC_LIBS="-ldb2" AC_DEFINE(HAVE_IBMDB2,1,[ ]) AC_MSG_RESULT(yes) @@ -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 @@ -507,12 +512,12 @@ AC_ARG_WITH(dbmaker, if test "$shared" = "yes"; then AC_MSG_RESULT(yes (shared)) ODBC_LIBS="-ldmapic -lc -lm" - ODBC_SHARED=odbc.la + ODBC_SHARED="odbc.la" else AC_MSG_RESULT(yes (static)) PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR) PHP_ADD_INCLUDE($ODBC_INCDIR) - ODBC_STATIC=libphpext_odbc.la + ODBC_STATIC="libphpext_odbc.la" fi AC_MSG_RESULT(yes) @@ -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 |