From: foobar <sniper@php.net>
Date: Tue, 25 Feb 2003 11:48:50 +0000 (+0000)
Subject: Cleanup
X-Git-Tag: RELEASE_0_5~748
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=400f466040095cd75d21355bc3082dd3e75fb9e5;p=php

Cleanup
---

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,[ ])