ws fixes

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 99d3d8f43edf90e4054bcf08980dbd54c17fdf55..e2ce2cbe55d478ba50772151e21c011601ca636b 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -12,22 +12,25 @@ AC_DEFUN(AC_FIND_SOLID_LIBS,[
   case $ac_solid_uname_s in
     AIX) ac_solid_os=a3x;;   # a4x for AIX4/ Solid 2.3/3.0 only
     HP-UX) ac_solid_os=h9x;; # h1x for hpux11, h0x for hpux10
-    IRIX) ac_solid_os=irx;;     # Solid 2.3(?)/ 3.0 only
-    Linux) if ldd -v /bin/sh | grep GLIBC > /dev/null; then
-               AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
-               ac_solid_os=l2x
-       else
-               AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
-               ac_solid_os=lux
-       fi;; 
-    SunOS) ac_solid_os=ssx;; # should we deal with SunOS 4?
-    FreeBSD) if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
-               AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
-               ac_solid_os=fex
-   else 
-               AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
-               ac_solid_os=fbx
-   fi  
+    IRIX) ac_solid_os=irx;;  # Solid 2.3(?)/ 3.0 only
+    Linux) 
+      if ldd -v /bin/sh | grep GLIBC > /dev/null; then
+        AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
+        ac_solid_os=l2x
+         else
+        AC_DEFINE(SS_LINUX,1,[Needed in sqlunix.h ])
+        ac_solid_os=lux
+      fi;; 
+    SunOS) 
+      ac_solid_os=ssx;; # should we deal with SunOS 4?
+    FreeBSD) 
+      if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
+        AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
+        ac_solid_os=fex
+      else 
+        AC_DEFINE(SS_FBX,1,[Needed in sqlunix.h for wchar defs ])
+        ac_solid_os=fbx
+      fi;;
   esac
 
   if test -f $1/soc${ac_solid_os}35.a; then
@@ -46,28 +49,25 @@ AC_DEFUN(AC_FIND_SOLID_LIBS,[
 #
 if test ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \
        ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then
-       #
-       # we have an error and should bail out, as we can't find the libs!
-       #
-       echo ""
-       echo "*********************************************************************"
-       echo "* Unable to locate $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
-       echo "* Please correct this by creating the following links and reconfiguring:"
-       echo "* $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
-       echo "* $1/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so"
-       echo "*********************************************************************"
+  #
+  # we have an error and should bail out, as we can't find the libs!
+  #
+  echo ""
+  echo "*********************************************************************"
+  echo "* Unable to locate $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
+  echo "* Please correct this by creating the following links and reconfiguring:"
+  echo "* $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a"
+  echo "* $1/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so"
+  echo "*********************************************************************"
 else
-       ODBC_LFLAGS=-L$1
-       ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
+  ODBC_LFLAGS=-L$1
+  ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
 fi
 
-
   AC_MSG_RESULT(`echo $ODBC_LIBS | sed -e 's!.*/!!'`)
 ])
 
 
-
-
 dnl
 dnl Figure out which library file to link with for the Empress support.
 dnl
@@ -107,8 +107,8 @@ AC_ARG_WITH(adabas,
     $srcdir/build/shtool mkdir -f -p ext/odbc
     rm -f "$ODBC_LIB"
     cp "$ODBC_OBJS" "$ODBC_LIB"
-       PHP_ADD_LIBRARY(sqlptc)
-       PHP_ADD_LIBRARY(sqlrte)
+    PHP_ADD_LIBRARY(sqlptc)
+    PHP_ADD_LIBRARY(sqlrte)
     PHP_ADD_LIBRARY_WITH_PATH(odbc_adabas, $abs_builddir/ext/odbc)
     ODBC_TYPE=adabas
     AC_DEFINE(HAVE_ADABAS,1,[ ])
@@ -164,9 +164,9 @@ AC_ARG_WITH(solid,
     ODBC_TYPE=solid
     if test -f $ODBC_LIBDIR/soc*35.a; then
       AC_DEFINE(HAVE_SOLID_35,1,[ ])
-       elif test -f $ODBC_LIBDIR/scl*30.a; then
-         AC_DEFINE(HAVE_SOLID_30,1,[ ])
-       elif test -f $ODBC_LIBDIR/scl*23.a; then
+    elif test -f $ODBC_LIBDIR/scl*30.a; then
+      AC_DEFINE(HAVE_SOLID_30,1,[ ])
+    elif test -f $ODBC_LIBDIR/scl*23.a; then
       AC_DEFINE(HAVE_SOLID,1,[ ])
     fi
     AC_MSG_RESULT(yes)
@@ -449,18 +449,18 @@ AC_ARG_WITH(openlink,
     withval=/usr/local
   fi
   if test "$withval" != "no"; then
-       PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib)
-       PHP_ADD_INCLUDE($withval/include, 1)
+    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib)
+    PHP_ADD_INCLUDE($withval/include, 1)
     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)
-       echo "****************************************************************"
-       echo "  --with-openlink will not be valid in future releases.  Please "
-       echo " update your configure script to use --with-iodbc instead.      "
-       echo "****************************************************************"
+    echo "****************************************************************"
+    echo "  --with-openlink will not be valid in future releases.  Please "
+    echo " update your configure script to use --with-iodbc instead.      "
+    echo "****************************************************************"
   else
     AC_MSG_RESULT(no)
   fi