Cleanup. ws fixes (no tabs in config.m4 files please)

diff --git a/ext/xslt/config.m4 b/ext/xslt/config.m4
index f5cf260380df64471bbdbb388af619ed6e0e63f0..a4d5984a359a541048b3dd8e994eebec75ee4d31 100644 (file)
--- a/ext/xslt/config.m4
+++ b/ext/xslt/config.m4
@@ -8,93 +8,82 @@ dnl   $Id$
 PHP_ARG_ENABLE(xslt, whether to enable xslt support,
 [  --enable-xslt           Enable xslt support])
 
-if test "$PHP_XSLT" != "no"; then
-
-       PHP_EXTENSION(xslt, $ext_shared)
-
-       PHP_ARG_WITH(xslt-sablot, whether to enable the sablotron backend,
-       [  --with-xslt-sablot      Enable the sablotron backend])
-
-       PHP_ARG_WITH(expat-dir, libexpat dir for Sablotron XSL support,
-       [  --with-expat-dir=DIR    Sablotron: libexpat dir for Sablotron 0.50])
+PHP_ARG_WITH(xslt-sablot, whether to enable the XSLT Sablotron backend,
+[  --with-xslt-sablot      XSLT: Enable the sablotron backend])
 
-       if test "$PHP_XSLT_SABLOT" != "no"; then
-               XSLT_CHECK_DIR=$PHP_XSLT_SABLOT
-               XSLT_TEST_FILE=/include/sablot.h
-               XSLT_BACKEND_NAME=Sablotron
-               XSLT_LIBNAME=sablot
-       fi
+PHP_ARG_WITH(expat-dir, libexpat dir for Sablotron XSL support,
+[  --with-expat-dir=DIR    Sablotron: libexpat dir for Sablotron 0.50])
 
-       condition="$XSLT_CHECK_DIR$XSLT_TEST_FILE"
-
-       if test -r $condition; then
-               XSLT_DIR=$XSLT_CHECK_DIR
-       else
-               AC_MSG_CHECKING(for $XSLT_BACKEND_NAME libraries in the default path)
-               for i in /usr /usr/local; do
-                       condition="$i$XSLT_TEST_FILE"
-                       if test -r $condition; then
-                               XSLT_DIR=$i
-                               AC_MSG_RESULT(found $XSLT_BACKEND_NAME in $i)
-                       fi
-               done
-       fi
+if test "$PHP_XSLT" != "no"; then
 
-       if test -z "$XSLT_DIR"; then
-               AC_MSG_RESULT(not found)
-               AC_MSG_ERROR(Please re-install the $XSLT_BACKEND_NAME distribution)
-       fi
+  PHP_EXTENSION(xslt, $ext_shared)
+  PHP_SUBST(XSLT_SHARED_LIBADD)
+
+  if test "$PHP_XSLT_SABLOT" != "no"; then
+    XSLT_CHECK_DIR=$PHP_XSLT_SABLOT
+    XSLT_TEST_FILE=/include/sablot.h
+    XSLT_BACKEND_NAME=Sablotron
+    XSLT_LIBNAME=sablot
+  fi
+
+  condition="$XSLT_CHECK_DIR$XSLT_TEST_FILE"
+
+  if test -r $condition; then
+    XSLT_DIR=$XSLT_CHECK_DIR
+  else
+    AC_MSG_CHECKING(for $XSLT_BACKEND_NAME libraries in the default path)
+    for i in /usr /usr/local; do
+      condition="$i$XSLT_TEST_FILE"
+      if test -r $condition; then
+        XSLT_DIR=$i
+        AC_MSG_RESULT(found $XSLT_BACKEND_NAME in $i)
+      fi
+    done
+  fi
+
+  if test -z "$XSLT_DIR"; then
+    AC_MSG_ERROR(not found. Please re-install the $XSLT_BACKEND_NAME distribution)
+  fi
                                        
-
-       if test -z "$XSLT_DIR"; then
-               AC_MSG_RESULT(not found)
-               AC_MSG_ERROR(Please re-install the $XSLT_BACKEND distribution)
-       fi
-
-       PHP_ADD_INCLUDE($XSLT_DIR/include)
-
-       PHP_SUBST(XSLT_SHARED_LIBADD)
-       PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib, XSLT_SHARED_LIBADD)
-
-       if test "$PHP_XSLT_SABLOT" != "no"; then
-               if test -z "$PHP_EXPAT_DIR"; then
-                       PHP_EXPAT_DIR=""
-               fi
-
-               found_expat=no
-               for i in $PHP_EXPAT_DIR $XSLT_DIR; do
-                       if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.so; then
-                               AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ])
-                               PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib)
-                               found_expat=yes
-                       fi
-               done
-
-               if test "$found_expat" = "no"; then
-                       PHP_ADD_LIBRARY(xmlparse)
-                       PHP_ADD_LIBRARY(xmltok)
-               fi
-
-               found_iconv=no
-               AC_CHECK_LIB(c, iconv_open, found_iconv=yes)
-               if test "$found_iconv" = "no"; then
-                       if test "$PHP_ICONV" = "no"; then
-                               for i in /usr /usr/local; do
-                                       if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.so; then
-                                               PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib)
-                                               found_iconv=yes
-                                       fi
-                               done
-                       fi
-               fi
-
-               if test "$found_iconv" = "no"; then
-                       AC_MSG_ERROR(iconv not found, in order to build sablotron you need the iconv library)
-               fi
+  PHP_ADD_INCLUDE($XSLT_DIR/include)
+  PHP_ADD_LIBRARY_WITH_PATH($XSLT_LIBNAME, $XSLT_DIR/lib, XSLT_SHARED_LIBADD)
+
+  if test "$PHP_XSLT_SABLOT" != "no"; then
+    found_expat=no
+    for i in $PHP_EXPAT_DIR $XSLT_DIR; do
+      if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.so; then
+        AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ])
+        PHP_ADD_INCLUDE($i/include)
+        PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib)
+        found_expat=yes
+      fi
+    done
+
+    if test "$found_expat" = "no"; then
+      PHP_ADD_LIBRARY(xmlparse)
+      PHP_ADD_LIBRARY(xmltok)
+    fi
+
+    found_iconv=no
+    AC_CHECK_LIB(c, iconv_open, found_iconv=yes)
+    if test "$found_iconv" = "no"; then
+      if test "$PHP_ICONV" = "no"; then
+        for i in /usr /usr/local; do
+          if test -f $i/lib/libconv.a -o -f $i/lib/libiconv.so; then
+            PHP_ADD_LIBRARY_WITH_PATH(iconv, $i/lib)
+            found_iconv=yes
+          fi
+        done
+      fi
+    fi
+
+    if test "$found_iconv" = "no"; then
+      AC_MSG_ERROR(iconv not found, in order to build sablotron you need the iconv library)
+    fi
  
-               AC_DEFINE(HAVE_SABLOT, 1, [ ])
-               AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ]))
-       fi
+    AC_DEFINE(HAVE_SABLOT_BACKEND, 1, [ ])
+    AC_CHECK_LIB(sablot, SablotSetEncoding, AC_DEFINE(HAVE_SABLOT_SET_ENCODING, 1, [ ]))
+  fi
 
-       AC_DEFINE(HAVE_XSLT, 1, [ ])
+  AC_DEFINE(HAVE_XSLT, 1, [ ])
 fi