From: Andreas Karajannis <kara@php.net>
Date: Sat, 21 Oct 2000 11:11:11 +0000 (+0000)
Subject: Config Patch for DBMaker
X-Git-Tag: php-4.0.4RC3~584
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d3b7d7cb2388648d69a1e3104e1671c777abbec;p=php

Config Patch for DBMaker
---

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index aaba400e89..5a18d76847 100644
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -405,8 +405,8 @@ AC_ARG_WITH(dbmaker,
     # check DBMaker version (from 5.0 to 2.0)
     DBMAKER_VERSION=5.0
 
-    while [ test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a \
-                 "$DBMAKER_VERSION" != "2.9" ]; do
+    while [[ test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a \
+                 "$DBMAKER_VERSION" != "2.9" ]]; do
         DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | awk '{ print $1-1;}'`
         MAJOR_V=`echo $DM_VER | awk '{ print $1/10; }' \
                  | awk  -F. '{ print $1; }'`
@@ -414,7 +414,7 @@ AC_ARG_WITH(dbmaker,
         DBMAKER_VERSION=$MAJOR_V.$MINOR_V
     done
 
-    if [ "$DBMAKER_VERSION" = "2.9" ]; then
+    if [[ "$DBMAKER_VERSION" = "2.9" ]]; then
         withval=$DBMAKER_HOME
     else
         DBMAKER_PATH=$DBMAKER_HOME/$DBMAKER_VERSION
@@ -436,8 +436,7 @@ AC_ARG_WITH(dbmaker,
 
     if test "$shared" = "yes"; then
         AC_MSG_RESULT(yes (shared))
-        ODBC_LFLAGS="-L$withval/driver/JDBC"
-        ODBC_LIBS="-ldmjdbc -lc -lm"
+        ODBC_LIBS="-ldmapic -lc -lm"
         ODBC_SHARED="odbc.la"
     else
         AC_MSG_RESULT(yes (static))