]> granicus.if.org Git - php/commitdiff
- Some config*.m4 file cleanups: NO tabs in these!
authorJani Taskinen <jani@php.net>
Mon, 14 Jul 2008 09:02:26 +0000 (09:02 +0000)
committerJani Taskinen <jani@php.net>
Mon, 14 Jul 2008 09:02:26 +0000 (09:02 +0000)
ext/intl/config.m4
ext/mysqlnd/config9.m4
ext/phar/config.m4
ext/zip/config.m4

index 9a6296f67243980a680ee61d4f678f17b010bca6..b90f227b4d923e5e8031dd7c3c356f05a072d595 100755 (executable)
@@ -10,57 +10,55 @@ if test "$PHP_INTL" != "no"; then
   PHP_SUBST(INTL_SHARED_LIBADD)
   PHP_REQUIRE_CXX()
 
-  PHP_NEW_EXTENSION(intl,
-                       php_intl.c \
-                   intl_error.c \
-                   intl_convert.c \
-                   collator/collator.c \
-                   collator/collator_class.c \
-                   collator/collator_sort.c \
-                   collator/collator_convert.c \
-                   collator/collator_locale.c \
-                   collator/collator_compare.c \
-                   collator/collator_attr.c \
-                   collator/collator_create.c \
-                   collator/collator_is_numeric.c \
-                   collator/collator_error.c \
-                   common/common_error.c \
-                   formatter/formatter.c \
-                   formatter/formatter_main.c \
-                   formatter/formatter_class.c \
-                   formatter/formatter_attr.c \
-                   formatter/formatter_data.c \
-                   formatter/formatter_format.c \
-                   formatter/formatter_parse.c \
-                   normalizer/normalizer.c \
-                   normalizer/normalizer_class.c \
-                   normalizer/normalizer_normalize.c \
-                   locale/locale.c \
-                   locale/locale_class.c \
-                   locale/locale_methods.c \
-                   dateformat/dateformat.c \
-                   dateformat/dateformat_class.c \
-                   dateformat/dateformat_attr.c \
-                   dateformat/dateformat_data.c \
-                   dateformat/dateformat_format.c \
-                   dateformat/dateformat_parse.c \
-               msgformat/msgformat.c \
-               msgformat/msgformat_attr.c \
-               msgformat/msgformat_class.c \
-               msgformat/msgformat_data.c  \
-               msgformat/msgformat_format.c \
-               msgformat/msgformat_helpers.cpp \
-               msgformat/msgformat_parse.c \
-               grapheme/grapheme_string.c \
-               grapheme/grapheme_util.c \
-                   ,$ext_shared,,$ICU_INCS)
+  PHP_NEW_EXTENSION(intl, php_intl.c \
+    intl_error.c \
+    intl_convert.c \
+    collator/collator.c \
+    collator/collator_class.c \
+    collator/collator_sort.c \
+    collator/collator_convert.c \
+    collator/collator_locale.c \
+    collator/collator_compare.c \
+    collator/collator_attr.c \
+    collator/collator_create.c \
+    collator/collator_is_numeric.c \
+    collator/collator_error.c \
+    common/common_error.c \
+    formatter/formatter.c \
+    formatter/formatter_main.c \
+    formatter/formatter_class.c \
+    formatter/formatter_attr.c \
+    formatter/formatter_data.c \
+    formatter/formatter_format.c \
+    formatter/formatter_parse.c \
+    normalizer/normalizer.c \
+    normalizer/normalizer_class.c \
+    normalizer/normalizer_normalize.c \
+    locale/locale.c \
+    locale/locale_class.c \
+    locale/locale_methods.c \
+    dateformat/dateformat.c \
+    dateformat/dateformat_class.c \
+    dateformat/dateformat_attr.c \
+    dateformat/dateformat_data.c \
+    dateformat/dateformat_format.c \
+    dateformat/dateformat_parse.c \
+    msgformat/msgformat.c \
+    msgformat/msgformat_attr.c \
+    msgformat/msgformat_class.c \
+    msgformat/msgformat_data.c  \
+    msgformat/msgformat_format.c \
+    msgformat/msgformat_helpers.cpp \
+    msgformat/msgformat_parse.c \
+    grapheme/grapheme_string.c \
+    grapheme/grapheme_util.c,$ext_shared)
 
-       PHP_ADD_BUILD_DIR($ext_builddir/collator)
-       PHP_ADD_BUILD_DIR($ext_builddir/common)
-       PHP_ADD_BUILD_DIR($ext_builddir/formatter)
-       PHP_ADD_BUILD_DIR($ext_builddir/normalizer)
-       PHP_ADD_BUILD_DIR($ext_builddir/dateformat)
-       PHP_ADD_BUILD_DIR($ext_builddir/locale)
-       PHP_ADD_BUILD_DIR($ext_builddir/msgformat)
-       PHP_ADD_BUILD_DIR($ext_builddir/grapheme)
+  PHP_ADD_BUILD_DIR($ext_builddir/collator)
+  PHP_ADD_BUILD_DIR($ext_builddir/common)
+  PHP_ADD_BUILD_DIR($ext_builddir/formatter)
+  PHP_ADD_BUILD_DIR($ext_builddir/normalizer)
+  PHP_ADD_BUILD_DIR($ext_builddir/dateformat)
+  PHP_ADD_BUILD_DIR($ext_builddir/locale)
+  PHP_ADD_BUILD_DIR($ext_builddir/msgformat)
+  PHP_ADD_BUILD_DIR($ext_builddir/grapheme)
 fi
index de1d53d31b3a50526da3465f639c0d1104c70c2a..08a38e8afbf295c3de610ec045c4d8d105397bf7 100644 (file)
@@ -4,8 +4,8 @@ dnl config.m4 for mysqlnd driver
 
 
 PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd,
-[  --enable-mysqlnd-threading  mysqlnd: Enable threaded fetch], no, no)
-
+[  --enable-mysqlnd-threading
+                            MYSQLND: Enable threaded fetch. Note: This forces ZTS on!], no, no)
 
 dnl If some extension uses mysqlnd it will get compiled in PHP core
 if test "$PHP_MYSQLND_ENABLED" = "yes"; then
@@ -26,7 +26,6 @@ if test "$PHP_MYSQLND_ENABLED" = "yes"; then
     AC_DEFINE([MYSQLND_THREADED], 1, [Whether mysqlnd threading is enabled])
   fi
 
-
   dnl This creates a file so it has to be after above macros
   PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [
     $ext_builddir/php_mysqlnd_config.h
index d1263e4de58b6c4102b55480e3706cbf11490d10..c2f3bb6d364534985c87215ed974389c6fc3b7a7 100644 (file)
@@ -2,7 +2,7 @@ dnl $Id$
 dnl config.m4 for extension phar
 
 PHP_ARG_ENABLE(phar, for phar archive support,
-[  --disable-phar         Disable phar support], yes)
+[  --disable-phar          Disable phar support], yes)
 
 if test "$PHP_PHAR" != "no"; then
   PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
index c7a5378963537900a70dfd2f9fd02078001c04c7..8b3d8a893692c08464b8d781f031de80643d6f47 100644 (file)
@@ -3,77 +3,75 @@ dnl $Id$
 dnl
 
 PHP_ARG_ENABLE(zip, for zip archive read/writesupport,
-[  --enable-zip        Include Zip read/write support.])
+[  --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
 
 PHP_ARG_WITH(pcre-dir, pcre install prefix,
-[  --with-pcre-dir           FILTER: pcre install prefix], no, no)
+[  --with-pcre-dir           ZIP: pcre install prefix], no, no)
 
 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
 
-
-       dnl This is PECL build, check if bundled PCRE library is used
-       old_CPPFLAGS=$CPPFLAGS
-       CPPFLAGS=$INCLUDES
-       AC_EGREP_CPP(yes,[
+  dnl This is PECL build, check if bundled PCRE library is used
+  old_CPPFLAGS=$CPPFLAGS
+  CPPFLAGS=$INCLUDES
+  AC_EGREP_CPP(yes,[
 #include <main/php_config.h>
 #if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE)
 yes
 #endif
-    ],[
-      PHP_PCRE_REGEX=yes
-    ],[
-      AC_EGREP_CPP(yes,[
+  ],[
+    PHP_PCRE_REGEX=yes
+  ],[
+    AC_EGREP_CPP(yes,[
 #include <main/php_config.h>
 #if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE)
 yes
 #endif
-      ],[
-        PHP_PCRE_REGEX=pecl
-      ],[
-        PHP_PCRE_REGEX=no
-      ])
+    ],[
+      PHP_PCRE_REGEX=pecl
+    ],[
+      PHP_PCRE_REGEX=no
     ])
-       CPPFLAGS=$old_CPPFLAGS
-
+  ])
+  CPPFLAGS=$old_CPPFLAGS
 
-       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 \
@@ -91,11 +89,11 @@ yes
                          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)
 
-       dnl so we always include the known-good working hack.
-       PHP_ADD_MAKEFILE_FRAGMENT
+  dnl so we always include the known-good working hack.
+  PHP_ADD_MAKEFILE_FRAGMENT
 fi