[PHP-CVS] cvs: php4(PHP_4_3) /ext/odbc config.m4

[Jani Taskinen]

sniper          Tue Feb 25 06:48:57 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php4/ext/odbc      config.m4 
  Log:
  MFH
  
Index: php4/ext/odbc/config.m4
diff -u php4/ext/odbc/config.m4:1.55 php4/ext/odbc/config.m4:1.55.2.1
--- php4/ext/odbc/config.m4:1.55        Tue Nov 12 12:31:39 2002
+++ php4/ext/odbc/config.m4     Tue Feb 25 06:48:57 2003
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.55 2002/11/12 17:31:39 sniper Exp $
+dnl $Id: config.m4,v 1.55.2.1 2003/02/25 11:48:57 sniper Exp $
 dnl
 
 dnl
@@ -188,16 +188,16 @@
   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)
@@ -537,8 +537,7 @@
 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,[ ])



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php