MFB

diff --git a/ext/zip/config.m4 b/ext/zip/config.m4
index c5edaa725e29b2ced5deddbc8ce8a6624152aec5..cc0aa517b9dc19177e323e524adf4de1c8e882a1 100644 (file)
--- a/ext/zip/config.m4
+++ b/ext/zip/config.m4
@@ -6,45 +6,45 @@ PHP_ARG_ENABLE(zip, for zip archive read/writesupport,
 [  --enable-zip            Include Zip read/write support])
 
 if test -z "$PHP_ZLIB_DIR"; then
-PHP_ARG_WITH(zlib-dir, for the location of libz,
-[  --with-zlib-dir[=DIR]     ZIP: Set the path to libz install prefix], no, no)
+  PHP_ARG_WITH(zlib-dir, for the location of libz,
+  [  --with-zlib-dir[=DIR]     ZIP: Set the path to libz install prefix], no, no)
 fi
 
 if test "$PHP_ZIP" != "no"; then
 
-       if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
-               if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
-                       PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
-                       PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
-               elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
-                       PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
-                       PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
-               else
-                       AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"])
-               fi
-       else
-               for i in /usr/local /usr; do
-                       if test -f "$i/include/zlib/zlib.h"; then
-                               PHP_ZLIB_DIR="$i"
-                               PHP_ZLIB_INCDIR="$i/include/zlib"
-                       elif test -f "$i/include/zlib.h"; then
-                               PHP_ZLIB_DIR="$i"
-                               PHP_ZLIB_INCDIR="$i/include"
-                       fi
-               done
-       fi
+  if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
+    if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
+      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
+    elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
+      PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+      PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
+    else
+      AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"])
+    fi
+  else
+    for i in /usr/local /usr; do
+      if test -f "$i/include/zlib/zlib.h"; then
+        PHP_ZLIB_DIR="$i"
+        PHP_ZLIB_INCDIR="$i/include/zlib"
+      elif test -f "$i/include/zlib.h"; then
+        PHP_ZLIB_DIR="$i"
+        PHP_ZLIB_INCDIR="$i/include"
+      fi
+    done
+  fi
 
-       dnl # zlib
-       AC_MSG_CHECKING([for the location of zlib])
-       if test "$PHP_ZLIB_DIR" = "no"; then
-               AC_MSG_ERROR([zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located])
-       else
-               AC_MSG_RESULT([$PHP_ZLIB_DIR])
-               PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, ZIP_SHARED_LIBADD)
-               PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR)
-       fi
+  dnl # zlib
+  AC_MSG_CHECKING([for the location of zlib])
+  if test "$PHP_ZLIB_DIR" = "no"; then
+    AC_MSG_ERROR([zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located])
+  else
+    AC_MSG_RESULT([$PHP_ZLIB_DIR])
+    PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, ZIP_SHARED_LIBADD)
+    PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR)
+  fi
 
-       PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
+  PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \
                          lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c  \
                          lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \
                          lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \
@@ -62,8 +62,8 @@ if test "$PHP_ZIP" != "no"; then
                          lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \
                          lib/zip_error_clear.c lib/zip_file_error_clear.c"
 
-       AC_DEFINE(HAVE_ZIP,1,[ ])
-       PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
-       PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
-       PHP_SUBST(ZIP_SHARED_LIBADD)
+  AC_DEFINE(HAVE_ZIP,1,[ ])
+  PHP_NEW_EXTENSION(zip, php_zip.c zip_stream.c $PHP_ZIP_SOURCES, $ext_shared)
+  PHP_ADD_BUILD_DIR($ext_builddir/lib, 1)
+  PHP_SUBST(ZIP_SHARED_LIBADD)
 fi