clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Some config*.m4 file cleanups: NO tabs in these!

Browse Source
This commit is contained in:
Jani Taskinen 2008-07-14 09:02:26 +00:00
parent 4db24954fb
commit 1e2b2bbeae
4 changed files with 108 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/intl/config.m4
View File

@ -10,8 +10,7 @@ if test "$PHP_INTL" != "no"; then
PHP_SUBST(INTL_SHARED_LIBADD)
PHP_REQUIRE_CXX()
PHP_NEW_EXTENSION(intl,
php_intl.c \
PHP_NEW_EXTENSION(intl, php_intl.c \
intl_error.c \
intl_convert.c \
collator/collator.c \
@ -52,8 +51,7 @@ if test "$PHP_INTL" != "no"; then
msgformat/msgformat_helpers.cpp \
msgformat/msgformat_parse.c \
grapheme/grapheme_string.c \
grapheme/grapheme_util.c \
,$ext_shared,,$ICU_INCS)
grapheme/grapheme_util.c,$ext_shared)
PHP_ADD_BUILD_DIR($ext_builddir/collator)
PHP_ADD_BUILD_DIR($ext_builddir/common)

5
ext/mysqlnd/config9.m4
View 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

10
ext/zip/config.m4
View File

@ -6,12 +6,12 @@ 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
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
@ -23,7 +23,7 @@ if test "$PHP_ZIP" != "no"; 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"])
AC_MSG_ERROR([Can not find zlib headers under "$PHP_ZLIB_DIR"])
fi
else
for i in /usr/local /usr; do
@ -47,7 +47,6 @@ if test "$PHP_ZIP" != "no"; then
PHP_ADD_INCLUDE($PHP_ZLIB_INCDIR)
fi
dnl This is PECL build, check if bundled PCRE library is used
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=$INCLUDES
@ -72,7 +71,6 @@ yes
])
CPPFLAGS=$old_CPPFLAGS
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 \