summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2003-02-25 11:48:50 +0000
committerfoobar <sniper@php.net>2003-02-25 11:48:50 +0000
commit400f466040095cd75d21355bc3082dd3e75fb9e5 (patch)
treeeb25d7a709e196e42dbd04bf1ecf4ccaf5687d32
parent7bd710a6586139aa763d9c0ac53e8681c51be6dd (diff)
downloadphp-git-400f466040095cd75d21355bc3082dd3e75fb9e5.tar.gz
Cleanup
-rw-r--r--ext/odbc/config.m413
1 files changed, 6 insertions, 7 deletions
diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 67839c56a7..fcb2946ed5 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -188,16 +188,16 @@ AC_ARG_WITH(ibm-db2,
PHP_WITH_SHARED
if test "$withval" != "no"; then
if test "$withval" = "yes"; then
- ODBC_INCDIR=/home/db2inst1/sqllib/include
- ODBC_LIBDIR=/home/db2inst1/sqllib/lib
+ ODBC_INCDIR=/home/db2inst1/sqllib/include
+ ODBC_LIBDIR=/home/db2inst1/sqllib/lib
else
- ODBC_INCDIR=$withval/include
- ODBC_LIBDIR=$withval/lib
+ ODBC_INCDIR=$withval/include
+ ODBC_LIBDIR=$withval/lib
fi
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)
@@ -538,8 +538,7 @@ fi
if test -n "$ODBC_TYPE"; then
if test "$ODBC_TYPE" != "dbmaker"; then
if test "$shared" != "yes"; then
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ODBC_LFLAGS"
- EXTRA_LIBS="$EXTRA_LIBS $ODBC_LIBS"
+ PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], OBDC_SHARED_LIBADD)
fi
fi
AC_DEFINE(HAVE_UODBC,1,[ ])