rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

7 files changed, 0 insertions, 2273 deletions

diff --git a/packages/modphp/files/70_mod_php4.conf b/packages/modphp/files/70_mod_php4.conf
deleted file mode 100644
index ce680323f6..0000000000
--- a/packages/modphp/files/70_mod_php4.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# vim: ft=apache sw=4 ts=4
-<IfDefine PHP4>
-
-	# Load the module first
-	<IfModule !sapi_apache2.c>
-		LoadModule php4_module    modules/libphp4.so
-	</IfModule>
-
-	# Set it to handle the files
-	<IfModule mod_mime.c>
-		AddType application/x-httpd-php .php
-		AddType application/x-httpd-php .phtml
-		AddType application/x-httpd-php .php3
-		AddType application/x-httpd-php .php4
-		AddType application/x-httpd-php-source .phps
-	</IfModule>
-
-	AddDirectoryIndex index.php index.phtml
-</IfDefine>
diff --git a/packages/modphp/files/70_mod_php5.conf b/packages/modphp/files/70_mod_php5.conf
deleted file mode 100644
index 1de6fb11ac..0000000000
--- a/packages/modphp/files/70_mod_php5.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# vim: ft=apache sw=4 ts=4
-<IfDefine PHP5>
-	# Load the module first
-	<IfModule !sapi_apache2.c>
-		LoadModule php5_module    lib/apache2/modules/libphp5.so
-	</IfModule>
-
-	# Set it to handle the files
-	AddHandler php5-script .php .phtml .php3 .php4 .php5
-	AddType application/x-httpd-php-source .phps
-	DirectoryIndex index.html index.html.var index.php index.phtml
-</IfDefine>
diff --git a/packages/modphp/files/autotools.patch b/packages/modphp/files/autotools.patch
deleted file mode 100644
index 712b85b67a..0000000000
--- a/packages/modphp/files/autotools.patch
+++ /dev/null
@@ -1,935 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- php-4.3.6/acinclude.m4~autotools.patch	2004-01-19 20:11:40.000000000 -0500
-+++ php-4.3.6/acinclude.m4	2004-06-04 18:21:54.893679473 -0400
-@@ -16,7 +16,7 @@
-   sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
- ])
- 
--AC_DEFUN(PHP_PROG_RE2C,[
-+AC_DEFUN([PHP_PROG_RE2C],[
-   AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;])
- ])
- 
-@@ -770,10 +770,10 @@
-   OVERALL_TARGET=[]ifelse($1,,php,$1)
-   php_c_pre='$(CC)'
-   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
--  php_c_post=' && echo > $[@]'
-+  php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
-   php_cxx_pre='$(CXX)'
-   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
--  php_cxx_post=' && echo > $[@]'
-+  php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
-   php_lo=o
-   
-   shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-@@ -1481,6 +1481,7 @@
- 
- 		dnl even newer glibcs have a different seeker definition...
- 
-+		AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
- 		AC_TRY_RUN([
- #define _GNU_SOURCE
- #include <stdio.h>
-@@ -1510,8 +1511,8 @@
- }
- 
- 					   ],
--					   [ cookie_io_functions_use_off64_t=yes ],
--					   [ ] )
-+					   [ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
-+					   [ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
- 		
-       else
-   	    dnl older glibc versions (up to 2.1.2 ?)
---- php-4.3.6/ext/cpdf/config.m4~autotools.patch	2003-09-30 22:53:53.000000000 -0400
-+++ php-4.3.6/ext/cpdf/config.m4	2004-06-04 18:21:54.893679473 -0400
-@@ -1,6 +1,6 @@
- dnl $Id: config.m4,v 1.10.4.6 2003/10/01 02:53:53 sniper Exp $
- 
--AC_DEFUN(CPDF_JPEG_TEST,[
-+AC_DEFUN([CPDF_JPEG_TEST],[
-   AC_ARG_WITH(jpeg-dir,
-   [  --with-jpeg-dir[=DIR]     CPDF: Set the path to libjpeg install prefix.],[
-     for i in $withval /usr/local /usr; do
-@@ -23,7 +23,7 @@
-   ],)
- ])
- 
--AC_DEFUN(CPDF_TIFF_TEST,[
-+AC_DEFUN([CPDF_TIFF_TEST],[
-   AC_ARG_WITH(tiff-dir,
-   [  --with-tiff-dir[=DIR]     CPDF: Set the path to libtiff install prefix.],[
-     for i in $withval /usr/local /usr; do
---- php-4.3.6/ext/db/config.m4~autotools.patch	2003-08-15 14:42:11.000000000 -0400
-+++ php-4.3.6/ext/db/config.m4	2004-06-04 18:21:54.893679473 -0400
-@@ -4,7 +4,7 @@
- 
- # Checks for libraries.
- # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
--AC_DEFUN(AC_PREFERRED_DB_LIB,[
-+AC_DEFUN([AC_PREFERRED_DB_LIB],[
-   AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm],
-   [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
-    [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
---- php-4.3.6/ext/dba/config.m4~autotools.patch	2004-03-07 19:01:03.000000000 -0500
-+++ php-4.3.6/ext/dba/config.m4	2004-06-04 18:21:54.894679234 -0400
-@@ -4,11 +4,11 @@
- 
- dnl Suppose we need FlatFile if no support or only CDB is used.
- 
--AC_DEFUN(PHP_DBA_STD_BEGIN,[
-+AC_DEFUN([PHP_DBA_STD_BEGIN],[
-   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
- ])
- 
--AC_DEFUN(PHP_TEMP_LDFLAGS,[
-+AC_DEFUN([PHP_TEMP_LDFLAGS],[
-   old_LDFLAGS=$LDFLAGS
-   LDFLAGS="$1 $LDFLAGS"
-   $2
-@@ -16,14 +16,14 @@
- ])
- 
- dnl Assign INCLUDE/LFLAGS from PREFIX
--AC_DEFUN(PHP_DBA_STD_ASSIGN,[
-+AC_DEFUN([PHP_DBA_STD_ASSIGN],[
-   if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
-     THIS_LFLAGS=$THIS_PREFIX/lib
-   fi
- ])
- 
- dnl Standard check
--AC_DEFUN(PHP_DBA_STD_CHECK,[
-+AC_DEFUN([PHP_DBA_STD_CHECK],[
-   THIS_RESULT="yes"
-   if test -z "$THIS_INCLUDE"; then
-     AC_MSG_ERROR([DBA: Could not find necessary header file(s).])
-@@ -34,14 +34,14 @@
- ])
- 
- dnl Attach THIS_x to DBA_x
--AC_DEFUN(PHP_DBA_STD_ATTACH,[
-+AC_DEFUN([PHP_DBA_STD_ATTACH],[
-   PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD)
-   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX
- ])
- 
- dnl Print the result message
- dnl parameters(name [, full name [, empty or error message]])
--AC_DEFUN(AC_DBA_STD_RESULT,[
-+AC_DEFUN([AC_DBA_STD_RESULT],[
-   THIS_NAME=[]translit($1,a-z0-9-,A-Z0-9_)
-   if test -n "$2"; then
-     THIS_FULL_NAME="$2"
-@@ -131,7 +131,7 @@
- 
- dnl Berkeley specific (library and version test)
- dnl parameters(version, library list, function)
--AC_DEFUN(PHP_DBA_DB_CHECK,[
-+AC_DEFUN([PHP_DBA_DB_CHECK],[
-   for LIB in $2; do
-     if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
-       PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[
-@@ -340,7 +340,7 @@
- ])
- AC_DBA_STD_RESULT(dbm)
- 
--AC_DEFUN(PHP_DBA_BUILTIN_CDB,[
-+AC_DEFUN([PHP_DBA_BUILTIN_CDB],[
-   AC_DEFINE(DBA_CDB_BUILTIN, 1, [ ])
-   AC_DEFINE(DBA_CDB_MAKE, 1, [ ])
-   AC_DEFINE(DBA_CDB, 1, [ ])
-@@ -386,7 +386,7 @@
- ])
- AC_DBA_STD_RESULT(cdb)
- 
--AC_DEFUN(PHP_DBA_BUILTIN_INI,[
-+AC_DEFUN([PHP_DBA_BUILTIN_INI],[
-   AC_DEFINE(DBA_INIFILE, 1, [ ])
-   ini_sources="libinifile/inifile.c"
-   THIS_RESULT="builtin"
-@@ -404,7 +404,7 @@
- ])
- AC_DBA_STD_RESULT(inifile,INI File)
- 
--AC_DEFUN(PHP_DBA_BUILTIN_FLATFILE,[
-+AC_DEFUN([PHP_DBA_BUILTIN_FLATFILE],[
-   AC_DEFINE(DBA_FLATFILE, 1, [ ])
-   flat_sources="libflatfile/flatfile.c"
-   THIS_RESULT="builtin"
---- php-4.3.6/ext/domxml/config.m4~autotools.patch	2002-10-30 12:42:36.000000000 -0500
-+++ php-4.3.6/ext/domxml/config.m4	2004-06-04 18:21:54.894679234 -0400
-@@ -2,7 +2,7 @@
- dnl $Id: config.m4,v 1.44 2002/10/30 17:42:36 helly Exp $
- dnl
- 
--AC_DEFUN(PHP_DOM_CHECK_VERSION,[
-+AC_DEFUN([PHP_DOM_CHECK_VERSION],[
-   old_CPPFLAGS=$CPPFLAGS
-   CPPFLAGS=-I$DOMXML_DIR/include$DOMXML_DIR_ADD
-   AC_MSG_CHECKING(for libxml version)
-@@ -78,7 +78,7 @@
-   PHP_SUBST(DOMXML_SHARED_LIBADD)
- fi
- 
--AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
-+AC_DEFUN([PHP_DOM_XSLT_CHECK_VERSION],[
-   old_CPPFLAGS=$CPPFLAGS
-   CPPFLAGS=-I$DOMXSLT_DIR/include
-   AC_MSG_CHECKING(for libxslt version)
-@@ -95,7 +95,7 @@
-   CPPFLAGS=$old_CPPFLAGS
- ])
- 
--AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
-+AC_DEFUN([PHP_DOM_EXSLT_CHECK_VERSION],[
-   old_CPPFLAGS=$CPPFLAGS
-   CPPFLAGS=-I$DOMEXSLT_DIR/include
-   AC_MSG_CHECKING(for libexslt version)
---- php-4.3.6/ext/gd/config.m4~autotools.patch	2003-12-25 17:33:02.000000000 -0500
-+++ php-4.3.6/ext/gd/config.m4	2004-06-04 18:21:54.894679234 -0400
-@@ -47,7 +47,7 @@
- dnl Checks for the configure options 
- dnl 
- 
--AC_DEFUN(PHP_GD_JPEG,[
-+AC_DEFUN([PHP_GD_JPEG],[
-   if test "$PHP_JPEG_DIR" != "no"; then
- 
-     for i in $PHP_JPEG_DIR /usr/local /usr; do
-@@ -72,7 +72,7 @@
-   fi
- ])
- 
--AC_DEFUN(PHP_GD_PNG,[
-+AC_DEFUN([PHP_GD_PNG],[
-   if test "$PHP_PNG_DIR" != "no"; then
- 
-     for i in $PHP_PNG_DIR /usr/local /usr; do
-@@ -107,7 +107,7 @@
-   fi
- ])
- 
--AC_DEFUN(PHP_GD_XPM,[
-+AC_DEFUN([PHP_GD_XPM],[
-   if test "$PHP_XPM_DIR" != "no"; then
- 
-     for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
-@@ -141,7 +141,7 @@
-   fi
- ])
- 
--AC_DEFUN(PHP_GD_FREETYPE1,[
-+AC_DEFUN([PHP_GD_FREETYPE1],[
-   if test "$PHP_TTF" != "no"; then
-     if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
-       if test -n "$PHP_TTF"; then
-@@ -175,7 +175,7 @@
-   fi
- ])
- 
--AC_DEFUN(PHP_GD_FREETYPE2,[
-+AC_DEFUN([PHP_GD_FREETYPE2],[
-   if test "$PHP_FREETYPE_DIR" != "no"; then
- 
-     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
-@@ -200,7 +200,7 @@
-   fi
- ])
- 
--AC_DEFUN(PHP_GD_T1LIB,[
-+AC_DEFUN([PHP_GD_T1LIB],[
-   if test "$PHP_T1LIB" != "no"; then
- 
-     for i in $PHP_T1LIB /usr/local /usr; do
-@@ -224,19 +224,19 @@
-   fi
- ])
- 
--AC_DEFUN(PHP_GD_TTSTR,[
-+AC_DEFUN([PHP_GD_TTSTR],[
-   if test "$PHP_GD_NATIVE_TTF" = "yes"; then
-     AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
-   fi
- ])
- 
--AC_DEFUN(PHP_GD_JISX0208,[
-+AC_DEFUN([PHP_GD_JISX0208],[
-   if test "$PHP_GD_JIS_CONV" = "yes"; then
-     USE_GD_JIS_CONV=1
-   fi
- ])
- 
--AC_DEFUN(PHP_GD_CHECK_VERSION,[
-+AC_DEFUN([PHP_GD_CHECK_VERSION],[
-   PHP_CHECK_LIBRARY(gd, gdImageString16,        [AC_DEFINE(HAVE_LIBGD13,             1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
-   PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy,     [AC_DEFINE(HAVE_LIBGD15,             1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
-   PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng,   [AC_DEFINE(HAVE_GD_PNG,              1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
---- php-4.3.6/ext/imap/config.m4~autotools.patch	2004-01-16 19:01:06.000000000 -0500
-+++ php-4.3.6/ext/imap/config.m4	2004-06-04 18:21:54.894679234 -0400
-@@ -2,7 +2,7 @@
- dnl $Id: config.m4,v 1.49.2.11 2004/01/17 00:01:06 sniper Exp $
- dnl
- 
--AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
-+AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
-     AC_DEFINE(HAVE_IMAP2000, 1, [ ])
-     IMAP_DIR=$i
-     IMAP_INC_DIR=$i$1
-@@ -13,7 +13,7 @@
- 	break
- ])
- 
--AC_DEFUN(IMAP_LIB_CHK,[
-+AC_DEFUN([IMAP_LIB_CHK],[
-   str="$IMAP_DIR/$1/lib$lib.*"
-   for i in `echo $str`; do
-     test -r $i && IMAP_LIBDIR=$IMAP_DIR/$1 && break 2
-@@ -21,7 +21,7 @@
- ])
- 
- dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs])
--AC_DEFUN(PHP_IMAP_TEST_BUILD, [
-+AC_DEFUN([PHP_IMAP_TEST_BUILD], [
-   old_LIBS=$LIBS
-   LIBS="$4 $LIBS"
-   AC_TRY_RUN([
-@@ -54,7 +54,7 @@
-   ])
- ])
- 
--AC_DEFUN(PHP_IMAP_KRB_CHK, [
-+AC_DEFUN([PHP_IMAP_KRB_CHK], [
-   AC_ARG_WITH(kerberos,
-   [  --with-kerberos[=DIR]     IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[
-     PHP_KERBEROS=$withval
-@@ -101,7 +101,7 @@
- 
- ])
- 
--AC_DEFUN(PHP_IMAP_SSL_CHK, [
-+AC_DEFUN([PHP_IMAP_SSL_CHK], [
-   AC_ARG_WITH(imap-ssl,
-   [  --with-imap-ssl=<DIR>     IMAP: Include SSL support. DIR is the OpenSSL install dir.],[
-     PHP_IMAP_SSL=$withval
---- php-4.3.6/ext/java/config.m4~autotools.patch	2003-04-04 12:43:13.000000000 -0500
-+++ php-4.3.6/ext/java/config.m4	2004-06-04 18:21:54.895678994 -0400
-@@ -1,7 +1,7 @@
- dnl
- dnl $Id: config.m4,v 1.46.4.3 2003/04/04 17:43:13 sniper Exp $
- dnl
--AC_DEFUN(JAVA_FIND_JAR, [
-+AC_DEFUN([JAVA_FIND_JAR], [
-  AC_MSG_CHECKING([Java Jar location])
-   if test "$PHP_JAVA" = "yes"; then
-     if JAVA_JAR=`which jar 2>/dev/null`; then
-@@ -31,7 +31,7 @@
-   AC_MSG_RESULT([$JAVA_JAR])
- ])
- 
--AC_DEFUN(JAVA_FIND_C, [
-+AC_DEFUN([JAVA_FIND_C], [
-  AC_MSG_CHECKING([Java C location])
-  if test "$PHP_JAVA" = "yes"; then
-    JAVA_C=`which javac`
-@@ -55,7 +55,7 @@
-   AC_MSG_RESULT([$JAVA_C])
- ])
- 
--AC_DEFUN(JAVA_CHECK_LIB, [
-+AC_DEFUN([JAVA_CHECK_LIB], [
-  AC_MSG_CHECKING([Checking for libjava])
-  if test -d $PHP_JAVA/lib/kaffe; then
-    PHP_ADD_LIBPATH($PHP_JAVA/lib)
---- php-4.3.6/ext/ldap/config.m4~autotools.patch	2003-06-30 20:02:29.000000000 -0400
-+++ php-4.3.6/ext/ldap/config.m4	2004-06-04 18:21:54.895678994 -0400
-@@ -2,7 +2,7 @@
- dnl $Id: config.m4,v 1.26.2.6 2003/07/01 00:02:29 sniper Exp $
- dnl
- 
--AC_DEFUN(PHP_LDAP_CHECKS, [
-+AC_DEFUN([PHP_LDAP_CHECKS], [
-   if test -f $1/include/ldap.h; then
-     LDAP_DIR=$1
-     LDAP_INCDIR=$1/include
---- php-4.3.6/ext/msql/config.m4~autotools.patch	2002-03-12 11:25:28.000000000 -0500
-+++ php-4.3.6/ext/msql/config.m4	2004-06-04 18:21:54.895678994 -0400
-@@ -5,7 +5,7 @@
- dnl
- dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined.
- dnl
--AC_DEFUN(PHP_MSQL_VERSION,[
-+AC_DEFUN([PHP_MSQL_VERSION],[
-   AC_MSG_CHECKING([mSQL version])
-   ac_php_oldcppflags=$CPPFLAGS
-   CPPFLAGS="$INCLUDES $CPPFLAGS"
---- php-4.3.6/ext/mysql/config.m4~autotools.patch	2003-12-31 06:28:38.000000000 -0500
-+++ php-4.3.6/ext/mysql/config.m4	2004-06-04 18:21:54.895678994 -0400
-@@ -7,7 +7,7 @@
- sinclude(libmysql/acinclude.m4)
- sinclude(libmysql/mysql.m4)
- 
--AC_DEFUN(MYSQL_LIB_CHK, [
-+AC_DEFUN([MYSQL_LIB_CHK], [
-   str="$MYSQL_DIR/$1/libmysqlclient.*"
-   for j in `echo $str`; do
-     if test -r $j; then
-@@ -17,7 +17,7 @@
-   done
- ])
- 
--AC_DEFUN(PHP_MYSQL_SOCKET_SEARCH, [
-+AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
-   for i in  \
-     /var/run/mysqld/mysqld.sock \
-     /var/tmp/mysql.sock \
---- php-4.3.6/ext/mysql/libmysql/acinclude.m4~autotools.patch	2002-12-05 10:46:41.000000000 -0500
-+++ php-4.3.6/ext/mysql/libmysql/acinclude.m4	2004-06-04 18:21:54.895678994 -0400
-@@ -1,6 +1,6 @@
- # Local macros for automake & autoconf
- 
--AC_DEFUN(MYSQL_FUNCTION_CHECKS,[
-+AC_DEFUN([MYSQL_FUNCTION_CHECKS],[
- 
- # Standard MySQL list
- AC_CHECK_FUNCS(alarm bmove \
-@@ -27,7 +27,7 @@
- MYSQL_CHECK_GETHOSTNAME_R
- ])
- 
--AC_DEFUN(MYSQL_CHECK_GETHOSTNAME_R,[
-+AC_DEFUN([MYSQL_CHECK_GETHOSTNAME_R],[
- # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
- ac_save_CXXFLAGS="$CXXFLAGS"
- AC_CACHE_CHECK([style of gethostname_r routines], mysql_cv_gethostname_style,
-@@ -90,7 +90,7 @@
- fi
- ])
- 
--AC_DEFUN(MYSQL_CHECK_SIGWAIT_STYLE,[
-+AC_DEFUN([MYSQL_CHECK_SIGWAIT_STYLE],[
- # Check definition av posix sigwait()
- AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,
- AC_TRY_LINK(
-@@ -134,7 +134,7 @@
- fi
- ])
- 
--AC_DEFUN(MYSQL_CHECK_READDIR_R_ARGS,[
-+AC_DEFUN([MYSQL_CHECK_READDIR_R_ARGS],[
- # Check definition of readdir_r
- AC_CACHE_CHECK("args to readdir_r", mysql_cv_readdir_r,
- AC_TRY_LINK(
-@@ -153,7 +153,7 @@
- fi
- ])
- 
--AC_DEFUN(MYSQL_CHECK_PTHREAD_MUTEX_INIT,[
-+AC_DEFUN([MYSQL_CHECK_PTHREAD_MUTEX_INIT],[
-   # Check definition of pthread_mutex_init
-   AC_CACHE_CHECK("args to pthread_mutex_init", mysql_cv_mutex_init_args,
-   AC_TRY_COMPILE(
-@@ -173,7 +173,7 @@
-   fi
- ])
- 
--AC_DEFUN(MYSQL_CHECK_PTHREAD_GETSPECIFIC,[
-+AC_DEFUN([MYSQL_CHECK_PTHREAD_GETSPECIFIC],[
-   # Check definition of pthread_getspecific
-   AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args,
-   AC_TRY_COMPILE(
-@@ -191,7 +191,7 @@
-   fi
- ])
- 
--AC_DEFUN(MYSQL_TYPE_ACCEPT,
-+AC_DEFUN([MYSQL_TYPE_ACCEPT],
- [ac_save_CXXFLAGS="$CXXFLAGS"
- AC_CACHE_CHECK([base type of last arg to accept], mysql_cv_btype_last_arg_accept,
- AC_LANG_SAVE
-@@ -224,7 +224,7 @@
- ])
- 
- dnl Find type of qsort
--AC_DEFUN(MYSQL_TYPE_QSORT,
-+AC_DEFUN([MYSQL_TYPE_QSORT],
- [AC_CACHE_CHECK([return type of qsort], mysql_cv_type_qsort,
- [AC_TRY_COMPILE([#include <stdlib.h>
- #ifdef __cplusplus
-@@ -243,7 +243,7 @@
- 
- 
- #---START: Used in for client configure
--AC_DEFUN(MYSQL_CHECK_ULONG,
-+AC_DEFUN([MYSQL_CHECK_ULONG],
- [AC_MSG_CHECKING(for type ulong)
- AC_CACHE_VAL(ac_cv_ulong,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -261,7 +261,7 @@
- fi
- ])
- 
--AC_DEFUN(MYSQL_CHECK_UCHAR,
-+AC_DEFUN([MYSQL_CHECK_UCHAR],
- [AC_MSG_CHECKING(for type uchar)
- AC_CACHE_VAL(ac_cv_uchar,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -279,7 +279,7 @@
- fi
- ])
- 
--AC_DEFUN(MYSQL_CHECK_UINT,
-+AC_DEFUN([MYSQL_CHECK_UINT],
- [AC_MSG_CHECKING(for type uint)
- AC_CACHE_VAL(ac_cv_uint,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -297,7 +297,7 @@
- fi
- ])
- 
--AC_DEFUN(MYSQL_CHECK_USHORT,
-+AC_DEFUN([MYSQL_CHECK_USHORT],
- [AC_MSG_CHECKING(for type ushort)
- AC_CACHE_VAL(ac_cv_ushort,
- [AC_TRY_RUN([#include <stdio.h>
-@@ -315,7 +315,7 @@
- fi
- ])
- 
--AC_DEFUN(MYSQL_CHECK_INT_8_16_32,
-+AC_DEFUN([MYSQL_CHECK_INT_8_16_32],
- [AC_MSG_CHECKING([for int8])
- AC_CACHE_VAL(ac_cv_int8,
- [AC_TRY_RUN([
-@@ -345,7 +345,7 @@
- ])
- 
- 
--AC_DEFUN(MYSQL_HEADER_CHECKS,[
-+AC_DEFUN([MYSQL_HEADER_CHECKS],[
- AC_HEADER_STDC
- AC_CHECK_HEADERS(sgtty.h sys/ioctl.h \
-  fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
-@@ -356,7 +356,7 @@
-  unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h)
- ])
- 
--AC_DEFUN(MYSQL_TYPE_CHECKS,[
-+AC_DEFUN([MYSQL_TYPE_CHECKS],[
- 
- AC_REQUIRE([AC_C_CONST])
- AC_REQUIRE([AC_C_INLINE])
---- php-4.3.6/ext/mysql/libmysql/mysql.m4~autotools.patch	2002-03-07 09:19:29.000000000 -0500
-+++ php-4.3.6/ext/mysql/libmysql/mysql.m4	2004-06-04 18:21:54.896678755 -0400
-@@ -1,4 +1,4 @@
--AC_DEFUN(MYSQL_CHECKS,[	
-+AC_DEFUN([MYSQL_CHECKS],[	
- 
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_PROG_LN_S])
---- php-4.3.6/ext/oci8/config.m4~autotools.patch	2004-02-03 09:22:34.000000000 -0500
-+++ php-4.3.6/ext/oci8/config.m4	2004-06-04 18:21:54.896678755 -0400
-@@ -2,7 +2,7 @@
- dnl $Id: config.m4,v 1.37.2.9 2004/02/03 14:22:34 tony2001 Exp $
- dnl
- 
--AC_DEFUN(PHP_OCI_IF_DEFINED,[
-+AC_DEFUN([PHP_OCI_IF_DEFINED],[
-   old_CPPFLAGS=$CPPFLAGS
-   CPPFLAGS=$3
-   AC_EGREP_CPP(yes,[
-@@ -18,7 +18,7 @@
-   ])
- ])
- 
--AC_DEFUN(AC_OCI8_VERSION,[
-+AC_DEFUN([AC_OCI8_VERSION],[
-   AC_MSG_CHECKING([Oracle version])
-   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
-     OCI8_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
---- php-4.3.6/ext/odbc/config.m4~autotools.patch	2003-11-25 03:08:30.000000000 -0500
-+++ php-4.3.6/ext/odbc/config.m4	2004-06-04 18:21:54.896678755 -0400
-@@ -5,7 +5,7 @@
- dnl
- dnl Figure out which library file to link with for the Solid support.
- dnl
--AC_DEFUN(AC_FIND_SOLID_LIBS,[
-+AC_DEFUN([AC_FIND_SOLID_LIBS],[
-   AC_MSG_CHECKING([Solid library file])  
-   ac_solid_uname_r=`uname -r 2>/dev/null`
-   ac_solid_uname_s=`uname -s 2>/dev/null`
-@@ -71,7 +71,7 @@
- dnl
- dnl Figure out which library file to link with for the Empress support.
- dnl
--AC_DEFUN(AC_FIND_EMPRESS_LIBS,[
-+AC_DEFUN([AC_FIND_EMPRESS_LIBS],[
-   AC_MSG_CHECKING([Empress library file])
-   ODBC_LIBS=`echo $1/libempodbccl.so | cut -d' ' -f1`
-   if test ! -f $ODBC_LIBS; then
-@@ -80,7 +80,7 @@
-   AC_MSG_RESULT(`echo $ODBC_LIBS | sed -e 's!.*/!!'`)
- ])
- 
--AC_DEFUN(AC_FIND_EMPRESS_BCS_LIBS,[
-+AC_DEFUN([AC_FIND_EMPRESS_BCS_LIBS],[
-   AC_MSG_CHECKING([Empress local access library file])
-   ODBCBCS_LIBS=`echo $1/libempodbcbcs.a | cut -d' ' -f1`
-   if test ! -f $ODBCBCS_LIBS; then
---- php-4.3.6/ext/oracle/config.m4~autotools.patch	2003-10-03 01:25:41.000000000 -0400
-+++ php-4.3.6/ext/oracle/config.m4	2004-06-04 18:21:54.896678755 -0400
-@@ -2,7 +2,7 @@
- dnl $Id: config.m4,v 1.29.4.1 2003/10/03 05:25:41 sniper Exp $
- dnl
- 
--AC_DEFUN(AC_ORACLE_VERSION,[
-+AC_DEFUN([AC_ORACLE_VERSION],[
-   AC_MSG_CHECKING([Oracle version])
-   if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
-   	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
---- php-4.3.6/ext/pgsql/config.m4~autotools.patch	2002-06-26 09:07:40.000000000 -0400
-+++ php-4.3.6/ext/pgsql/config.m4	2004-06-04 18:21:54.896678755 -0400
-@@ -2,7 +2,7 @@
- dnl $Id: config.m4,v 1.34 2002/06/26 13:07:40 derick Exp $
- dnl
- 
--AC_DEFUN(PHP_PGSQL_CHECK_FUNCTIONS,[
-+AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
- ])
- 
- PHP_ARG_WITH(pgsql,for PostgreSQL support,
---- php-4.3.6/ext/standard/config.m4~autotools.patch	2004-04-04 08:31:38.000000000 -0400
-+++ php-4.3.6/ext/standard/config.m4	2004-06-04 18:21:54.897678515 -0400
-@@ -5,7 +5,7 @@
- dnl
- dnl Check if flush should be called explicitly after buffered io
- dnl
--AC_DEFUN(AC_FLUSH_IO,[
-+AC_DEFUN([AC_FLUSH_IO],[
-   AC_CACHE_CHECK([whether flush should be called explicitly after a buffered io], ac_cv_flush_io,[
-   AC_TRY_RUN( [
- #include <stdio.h>
-@@ -56,7 +56,7 @@
- dnl
- dnl Check for crypt() capabilities
- dnl
--AC_DEFUN(AC_CRYPT_CAP,[
-+AC_DEFUN([AC_CRYPT_CAP],[
- 
-   if test "$ac_cv_func_crypt" = "no"; then
-   AC_CHECK_LIB(crypt, crypt, [
---- php-4.3.6/ext/xmlrpc/libxmlrpc/acinclude.m4~autotools.patch	2001-09-06 05:36:57.000000000 -0400
-+++ php-4.3.6/ext/xmlrpc/libxmlrpc/acinclude.m4	2004-06-04 18:21:54.897678515 -0400
-@@ -1,6 +1,6 @@
- # Local macros for automake & autoconf
- 
--AC_DEFUN(XMLRPC_FUNCTION_CHECKS,[
-+AC_DEFUN([XMLRPC_FUNCTION_CHECKS],[
- 
- # Standard XMLRPC list
- AC_CHECK_FUNCS( \
-@@ -10,12 +10,12 @@
- 
- ])
- 
--AC_DEFUN(XMLRPC_HEADER_CHECKS,[
-+AC_DEFUN([XMLRPC_HEADER_CHECKS],[
- AC_HEADER_STDC
- AC_CHECK_HEADERS(xmlparse.h xmltok.h stdlib.h strings.h string.h)
- ])
- 
--AC_DEFUN(XMLRPC_TYPE_CHECKS,[
-+AC_DEFUN([XMLRPC_TYPE_CHECKS],[
- 
- AC_REQUIRE([AC_C_CONST])
- AC_REQUIRE([AC_C_INLINE])
---- php-4.3.6/ext/xmlrpc/libxmlrpc/xmlrpc.m4~autotools.patch	2002-03-07 09:19:43.000000000 -0500
-+++ php-4.3.6/ext/xmlrpc/libxmlrpc/xmlrpc.m4	2004-06-04 18:21:54.897678515 -0400
-@@ -1,4 +1,4 @@
--AC_DEFUN(XMLRPC_CHECKS,[	
-+AC_DEFUN([XMLRPC_CHECKS],[	
- 
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_PROG_LN_S])
---- php-4.3.6/sapi/cgi/config9.m4~autotools.patch	2003-12-01 11:12:38.000000000 -0500
-+++ php-4.3.6/sapi/cgi/config9.m4	2004-06-04 18:21:54.897678515 -0400
-@@ -51,7 +51,7 @@
-   PHP_ENABLE_PATHINFO_CHECK=yes
- ])
- 
--AC_DEFUN(PHP_TEST_WRITE_STDOUT,[
-+AC_DEFUN([PHP_TEST_WRITE_STDOUT],[
-   AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[
-     AC_TRY_RUN([
- #ifdef HAVE_UNISTD_H
---- php-4.3.6/sapi/cgi/libfcgi/acinclude.m4~autotools.patch	2002-12-02 00:25:55.000000000 -0500
-+++ php-4.3.6/sapi/cgi/libfcgi/acinclude.m4	2004-06-04 18:21:54.897678515 -0400
-@@ -1,6 +1,6 @@
- dnl     $Id: acinclude.m4,v 1.1.2.2 2002/12/02 05:25:55 shane Exp $
- 
--AC_DEFUN(FCGI_COMMON_CHECKS, [
-+AC_DEFUN([FCGI_COMMON_CHECKS], [
-     AC_MSG_CHECKING([for sun_len in sys/un.h])
-     AC_EGREP_HEADER([sun_len], [sys/un.h],
- 	[AC_MSG_RESULT([yes])
---- php-4.3.6/scripts/phpize.m4~autotools.patch	2003-09-03 04:07:51.000000000 -0400
-+++ php-4.3.6/scripts/phpize.m4	2004-06-04 18:21:54.897678515 -0400
-@@ -6,7 +6,7 @@
- 
- PHP_INIT_BUILD_SYSTEM
- 
--AC_DEFUN(PHP_WITH_PHP_CONFIG,[
-+AC_DEFUN([PHP_WITH_PHP_CONFIG],[
-   AC_ARG_WITH(php-config,
- [  --with-php-config=PATH],[
-   PHP_CONFIG=$withval
-@@ -29,10 +29,10 @@
-   AC_MSG_RESULT($EXTENSION_DIR)
- ])
- dnl
--AC_DEFUN(PHP_EXT_BUILDDIR,[.])dnl
--AC_DEFUN(PHP_EXT_DIR,[""])dnl
--AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir])dnl
--AC_DEFUN(PHP_ALWAYS_SHARED,[
-+AC_DEFUN([PHP_EXT_BUILDDIR],[.])dnl
-+AC_DEFUN([PHP_EXT_DIR],[""])dnl
-+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir])dnl
-+AC_DEFUN([PHP_ALWAYS_SHARED],[
-   ext_output="yes, shared"
-   ext_shared=yes
-   test "[$]$1" = "no" && $1=yes
---- php-4.3.6/TSRM/acinclude.m4~autotools.patch	1999-10-04 11:22:18.000000000 -0400
-+++ php-4.3.6/TSRM/acinclude.m4	2004-06-04 18:21:54.898678276 -0400
-@@ -1,5 +1,10 @@
--
--AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
--  LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
-+dnl
-+dnl Set libtool variable
-+dnl
-+AC_DEFUN([PHP_SET_LIBTOOL_VARIABLE],[
-+  if test -z "$LIBTOOL"; then
-+    LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
-+  else
-+    LIBTOOL="$LIBTOOL $1"
-+  fi
- ])
--
---- php-4.3.6/TSRM/threads.m4~autotools.patch	2002-10-05 07:26:17.000000000 -0400
-+++ php-4.3.6/TSRM/threads.m4	2004-06-04 18:21:54.898678276 -0400
-@@ -30,7 +30,7 @@
- dnl
- dnl Set some magic defines to achieve POSIX threads conformance
- dnl
--AC_DEFUN(PTHREADS_FLAGS,[
-+AC_DEFUN([PTHREADS_FLAGS],[
-   if test -z "$host_alias" && test -n "$host"; then
-     host_alias=$host
-   fi
-@@ -65,7 +65,7 @@
- dnl
- dnl Check whether the current setup can use POSIX threads calls
- dnl
--AC_DEFUN(PTHREADS_CHECK_COMPILE, [
-+AC_DEFUN([PTHREADS_CHECK_COMPILE], [
- AC_TRY_RUN( [
- #include <pthread.h>
- #include <stddef.h>
-@@ -100,7 +100,7 @@
- dnl  -qthreaded        AIX cc V5
- dnl  -threads          gcc (HP-UX)
- dnl
--AC_DEFUN(PTHREADS_CHECK,[
-+AC_DEFUN([PTHREADS_CHECK],[
- 
- if test "$beos_threads" = "1"; then
-   pthreads_working="yes"
-@@ -154,7 +154,7 @@
- ])dnl
- dnl
- dnl
--AC_DEFUN(PTHREADS_ASSIGN_VARS,[
-+AC_DEFUN([PTHREADS_ASSIGN_VARS],[
- if test -n "$ac_cv_pthreads_lib"; then
-   LIBS="$LIBS -l$ac_cv_pthreads_lib"
- fi
---- php-4.3.6/TSRM/tsrm.m4~autotools.patch	2003-10-03 01:25:30.000000000 -0400
-+++ php-4.3.6/TSRM/tsrm.m4	2004-06-04 18:21:54.898678276 -0400
-@@ -1,6 +1,6 @@
- 
- dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)	
--AC_DEFUN(TSRM_CHECK_GCC_ARG,[
-+AC_DEFUN([TSRM_CHECK_GCC_ARG],[
-   gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
-   AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
-   echo 'void somefunc() { };' > conftest.c
-@@ -21,7 +21,7 @@
-   fi
- ])
- 
--AC_DEFUN(TSRM_BASIC_CHECKS,[
-+AC_DEFUN([TSRM_BASIC_CHECKS],[
- 
- AC_REQUIRE([AC_PROG_CC])dnl
- dnl AC_REQUIRE([AM_PROG_CC_STDC])dnl
-@@ -33,7 +33,7 @@
- ])
- 
- 
--AC_DEFUN(TSRM_CHECK_PTH,[
-+AC_DEFUN([TSRM_CHECK_PTH],[
- 
- AC_MSG_CHECKING(for GNU Pth)
- PTH_PREFIX="`$1 --prefix`"
-@@ -50,7 +50,7 @@
- 
- ])
- 
--AC_DEFUN(TSRM_CHECK_ST,[
-+AC_DEFUN([TSRM_CHECK_ST],[
-   if test -r "$1/include/st.h"; then
-     CPPFLAGS="$CPPFLAGS -I$1/include"
-     LDFLAGS="$LDFLAGS -L$1/lib"
-@@ -68,9 +68,8 @@
- ])
- 
- sinclude(threads.m4)
--sinclude(TSRM/threads.m4)
- 
--AC_DEFUN(TSRM_CHECK_PTHREADS,[
-+AC_DEFUN([TSRM_CHECK_PTHREADS],[
- 		
- PTHREADS_CHECK
- 
-@@ -89,7 +88,7 @@
- ])
- 
- 
--AC_DEFUN(TSRM_THREADS_CHECKS,[
-+AC_DEFUN([TSRM_THREADS_CHECKS],[
- 
- dnl For the thread implementations, we always use --with-*
- dnl to maintain consistency
---- php-4.3.6/Zend/acinclude.m4~autotools.patch	2000-06-18 12:51:41.000000000 -0400
-+++ php-4.3.6/Zend/acinclude.m4	2004-06-04 18:21:54.898678276 -0400
-@@ -2,7 +2,7 @@
- dnl
- dnl This file contains local autoconf functions.
- 
--AC_DEFUN(ZEND_FP_EXCEPT,[
-+AC_DEFUN([ZEND_FP_EXCEPT],[
-   AC_CACHE_CHECK(whether fp_except is defined, ac_cv_type_fp_except,[
-     AC_TRY_COMPILE([
- #include <floatingpoint.h>
-@@ -23,7 +23,7 @@
- dnl
- dnl Check for broken sprintf()
- dnl
--AC_DEFUN(AC_ZEND_BROKEN_SPRINTF,[
-+AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[
-   AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
-     AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
-       ac_cv_broken_sprintf=no
-@@ -41,7 +41,7 @@
-   AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken])
- ])
- 
--AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
-+AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
-   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
- ])
- 
---- php-4.3.6/Zend/Zend.m4~autotools.patch	2003-10-07 18:49:27.000000000 -0400
-+++ php-4.3.6/Zend/Zend.m4	2004-06-04 18:21:54.898678276 -0400
-@@ -4,7 +4,7 @@
- dnl This file contains Zend specific autoconf functions.
- dnl
- 
--AC_DEFUN(LIBZEND_BISON_CHECK,[
-+AC_DEFUN([LIBZEND_BISON_CHECK],[
- 
- if test "$YACC" != "bison -y"; then
-     AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
-@@ -19,7 +19,7 @@
- 
- ])
- 
--AC_DEFUN(LIBZEND_BASIC_CHECKS,[
-+AC_DEFUN([LIBZEND_BASIC_CHECKS],[
- 
- AC_REQUIRE([AC_PROG_YACC])
- AC_REQUIRE([AC_PROG_CC])
-@@ -74,12 +74,12 @@
- 	
- ])
- 
--AC_DEFUN(LIBZEND_LIBDL_CHECKS,[
-+AC_DEFUN([LIBZEND_LIBDL_CHECKS],[
- AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"])
- AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])])
- ])
- 
--AC_DEFUN(LIBZEND_DLSYM_CHECK,[
-+AC_DEFUN([LIBZEND_DLSYM_CHECK],[
- dnl
- dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name.
- dnl
-@@ -96,7 +96,7 @@
- 
- 
- 
--AC_DEFUN(LIBZEND_ENABLE_DEBUG,[
-+AC_DEFUN([LIBZEND_ENABLE_DEBUG],[
- 
- AC_ARG_ENABLE(debug,
- [  --enable-debug         Compile with debugging symbols],[
-@@ -118,7 +118,7 @@
- 
- 
- 
--AC_DEFUN(LIBZEND_OTHER_CHECKS,[
-+AC_DEFUN([LIBZEND_OTHER_CHECKS],[
- 
- AC_ARG_ENABLE(experimental-zts,
- [  --enable-experimental-zts   
-@@ -210,6 +210,6 @@
- ])
- 
- 
--AC_DEFUN(LIBZEND_CPLUSPLUS_CHECKS,[
-+AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
- 
- ])
---- php-4.3.6/configure.in~autotools.patch	2004-04-14 11:00:35.000000000 -0400
-+++ php-4.3.6/configure.in	2004-06-04 18:21:54.899678036 -0400
-@@ -45,10 +45,10 @@
- VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
- 
- dnl Define where extension directories are located in the configure context
--AC_DEFUN(PHP_EXT_BUILDDIR,[ext/$1])dnl
--AC_DEFUN(PHP_EXT_DIR,[ext/$1])dnl
--AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir/ext/$1])dnl
--AC_DEFUN(PHP_ALWAYS_SHARED,[])dnl
-+AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
-+AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
-+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
-+AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
- 
- dnl Setting up the PHP version based on the information above.
- dnl -------------------------------------------------------------------------
---- php-4.3.6/TSRM/configure.in~autotools.patch	2001-08-08 06:26:21.000000000 -0400
-+++ php-4.3.6/TSRM/configure.in	2004-06-04 18:21:54.899678036 -0400
-@@ -14,7 +14,7 @@
- 	
- AM_PROG_LIBTOOL
- if test "$enable_debug" != "yes"; then
--  AM_SET_LIBTOOL_VARIABLE([--silent])
-+  PHP_SET_LIBTOOL_VARIABLE([--silent])
- fi
- 
- dnl TSRM_PTHREAD
diff --git a/packages/modphp/files/configure.patch b/packages/modphp/files/configure.patch
deleted file mode 100644
index c5334c706e..0000000000
--- a/packages/modphp/files/configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- php-5.1.6/configure.old	2006-09-12 07:54:14.000000000 -0700
-+++ php-5.1.6/configure	2006-09-12 07:54:37.000000000 -0700
-@@ -14715,8 +14715,6 @@
- 
- 
- 
--  unset ac_cv_func_dlopen
--  unset ac_cv_func___dlopen
-   unset found
-   
-   echo $ac_n "checking for dlopen""... $ac_c" 1>&6
diff --git a/packages/modphp/files/endianness.patch b/packages/modphp/files/endianness.patch
deleted file mode 100644
index 0231727c33..0000000000
--- a/packages/modphp/files/endianness.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- php-5.0.5/Zend/zend_strtod.c~	2005-10-10 19:58:06.000000000 -0700
-+++ php-5.0.5/Zend/zend_strtod.c	2005-10-10 20:21:35.000000000 -0700
-@@ -130,6 +130,7 @@
-  * but the word order is big endian.
-  */
- #define IEEE_BIG_ENDIAN
-+#undef IEEE_LITTLE_ENDIAN
- #endif
- 
- #ifdef __vax__
diff --git a/packages/modphp/files/pear.patch b/packages/modphp/files/pear.patch
deleted file mode 100644
index fc9ed05af0..0000000000
--- a/packages/modphp/files/pear.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- php-4.3.6/configure.in~pear.patch	2004-06-04 19:03:26.595419000 -0400
-+++ php-4.3.6/configure.in	2004-06-04 19:10:32.984552663 -0400
-@@ -850,15 +850,38 @@
- [  --with-pear=DIR         Install PEAR in DIR (default PREFIX/lib/php)
-   --without-pear          Do not install PEAR], DEFAULT, yes)
- 
-+AC_ARG_WITH([pear-php-cli],
-+[  --with-pear-php-cli=CLI ],
-+[
-+  PEAR_PHP_CLI="$withval"
-+],[
-+  PEAR_PHP_CLI=""
-+])
-+
- if test "$PHP_PEAR" != "no"; then
- 
-   dnl
-   dnl PEAR dependancies
-   dnl
--  if test "$PHP_SAPI_CLI" = "no"; then
--    pear_error_msg="$pear_error_msg 
--                    PEAR requires CLI to be enabled.     Add --enable-cli to the configure line. (or --disable-pear)"
-+
-+  dnl PEAR requires a native PHP CLI.
-+  if test "x$PEAR_PHP_CLI" == "x"; then
-+    if test "x$cross_compiling" = "xyes"; then
-+      pear_error_msg="$pear_error_msg
-+                      PEAR requires a native architecture PHP CLI when crosscompiling.
-+                      Add --with-pear-php-cli=PATH to the configure line. (or --disable-pear)"
-+    else
-+      if test "x$PHP_SAPI_CLI" != "xno"; then
-+        PEAR_PHP_CLI="$PHP_SAPI_CLI"
-+      else
-+        pear_error_msg="$pear_error_msg 
-+                        PEAR requires CLI to be enabled.     Add --enable-cli to the configure line. (or --disable-pear)"
-+      fi
-+    fi
-   fi
-+      
-+  AC_SUBST([PEAR_PHP_CLI])
-+    
-   if test "$PHP_PCRE_REGEX" = "no"; then
-     pear_error_msg="$pear_error_msg 
-                     PEAR requires PCRE to be enabled.    Add --with-pcre-regex to the configure line. (or --disable-pear)"
-@@ -1233,6 +1256,7 @@
- PHP_ADD_BUILD_DIR(Zend)
- 
- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts)
-+AC_OUTPUT([pear/Makefile.frag])
- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/pear/Makefile.frag,$abs_srcdir/pear,pear)
- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Makefile.frag,$abs_srcdir/Zend,Zend)
- 
---- /dev/null	2004-02-23 16:04:30.000000000 -0500
-+++ php-4.3.6/pear/Makefile.frag.in	2004-06-04 19:10:53.643569437 -0400
-@@ -0,0 +1,23 @@
-+# -*- makefile -*-
-+
-+peardir=$(PEAR_INSTALLDIR)
-+
-+# Skip all php.ini files altogether
-+PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0
-+PEAR_PHP_CLI = @PEAR_PHP_CLI@
-+
-+install-pear-installer: $(PEAR_PHP_CLI)
-+	@$(PEAR_PHP_CLI) $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/package-*.xml
-+
-+install-pear-packages: $(PEAR_PHP_CLI)
-+	@$(PEAR_PHP_CLI) $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/packages/*.tar
-+
-+install-pear:
-+	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
-+	@if $(mkinstalldirs) $(INSTALL_ROOT)$(peardir); then \
-+		$(MAKE) -s install-pear-installer install-pear-packages; \
-+	else \
-+		cat $(srcdir)/install-pear.txt; \
-+		exit 5; \
-+	fi
-+
diff --git a/packages/modphp/files/php.ini b/packages/modphp/files/php.ini
deleted file mode 100644
index dda2fb2b86..0000000000
--- a/packages/modphp/files/php.ini
+++ /dev/null
@@ -1,1203 +0,0 @@
-[PHP]
-
-;;;;;;;;;;;
-; WARNING ;
-;;;;;;;;;;;
-; This is the default settings file for new PHP installations.
-; By default, PHP installs itself with a configuration suitable for
-; development purposes, and *NOT* for production purposes.
-; For several security-oriented considerations that should be taken
-; before going online with your site, please consult php.ini-recommended
-; and http://php.net/manual/en/security.php.
-
-
-;;;;;;;;;;;;;;;;;;;
-; About php.ini   ;
-;;;;;;;;;;;;;;;;;;;
-; This file controls many aspects of PHP's behavior.  In order for PHP to
-; read it, it must be named 'php.ini'.  PHP looks for it in the current
-; working directory, in the path designated by the environment variable
-; PHPRC, and in the path that was defined in compile time (in that order).
-; Under Windows, the compile-time path is the Windows directory.  The
-; path in which the php.ini file is looked for can be overridden using
-; the -c argument in command line mode.
-;
-; The syntax of the file is extremely simple.  Whitespace and Lines
-; beginning with a semicolon are silently ignored (as you probably guessed).
-; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future.
-;
-; Directives are specified using the following syntax:
-; directive = value
-; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
-;
-; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
-; of the INI constants (On, Off, True, False, Yes, No and None) or an expression
-; (e.g. E_ALL & ~E_NOTICE), or a quoted string ("foo").
-;
-; Expressions in the INI file are limited to bitwise operators and parentheses:
-; |        bitwise OR
-; &        bitwise AND
-; ~        bitwise NOT
-; !        boolean NOT
-;
-; Boolean flags can be turned on using the values 1, On, True or Yes.
-; They can be turned off using the values 0, Off, False or No.
-;
-; An empty string can be denoted by simply not writing anything after the equal
-; sign, or by using the None keyword:
-;
-;  foo =         ; sets foo to an empty string
-;  foo = none    ; sets foo to an empty string
-;  foo = "none"  ; sets foo to the string 'none'
-;
-; If you use constants in your value, and these constants belong to a
-; dynamically loaded extension (either a PHP extension or a Zend extension),
-; you may only use these constants *after* the line that loads the extension.
-;
-;
-;;;;;;;;;;;;;;;;;;;
-; About this file ;
-;;;;;;;;;;;;;;;;;;;
-; All the values in the php.ini-dist file correspond to the builtin
-; defaults (that is, if no php.ini is used, or if you delete these lines,
-; the builtin defaults will be identical).
-
-
-;;;;;;;;;;;;;;;;;;;;
-; Language Options ;
-;;;;;;;;;;;;;;;;;;;;
-
-; Enable the PHP scripting language engine under Apache.
-engine = On
-
-; Enable compatibility mode with Zend Engine 1 (PHP 4.x)
-zend.ze1_compatibility_mode = Off
-
-; Allow the <? tag.  Otherwise, only <?php and <script> tags are recognized.
-; NOTE: Using short tags should be avoided when developing applications or
-; libraries that are meant for redistribution, or deployment on PHP
-; servers which are not under your control, because short tags may not
-; be supported on the target server. For portable, redistributable code,
-; be sure not to use short tags.
-short_open_tag = On
-
-; Allow ASP-style <% %> tags.
-asp_tags = Off
-
-; The number of significant digits displayed in floating point numbers.
-precision    =  12
-
-; Enforce year 2000 compliance (will cause problems with non-compliant browsers)
-y2k_compliance = On
-
-; Output buffering allows you to send header lines (including cookies) even
-; after you send body content, at the price of slowing PHP's output layer a
-; bit.  You can enable output buffering during runtime by calling the output
-; buffering functions.  You can also enable output buffering for all files by
-; setting this directive to On.  If you wish to limit the size of the buffer
-; to a certain size - you can use a maximum number of bytes instead of 'On', as
-; a value for this directive (e.g., output_buffering=4096).
-output_buffering = 4096
-
-; You can redirect all of the output of your scripts to a function.  For
-; example, if you set output_handler to "mb_output_handler", character
-; encoding will be transparently converted to the specified encoding.
-; Setting any output handler automatically turns on output buffering.
-; Note: People who wrote portable scripts should not depend on this ini
-;       directive. Instead, explicitly set the output handler using ob_start().
-;       Using this ini directive may cause problems unless you know what script
-;       is doing.
-; Note: You cannot use both "mb_output_handler" with "ob_iconv_handler"
-;       and you cannot use both "ob_gzhandler" and "zlib.output_compression".
-; Note: output_handler must be empty if this is set 'On' !!!!
-;       Instead you must use zlib.output_handler.
-;output_handler =
-
-; Transparent output compression using the zlib library
-; Valid values for this option are 'off', 'on', or a specific buffer size
-; to be used for compression (default is 4KB)
-; Note: Resulting chunk size may vary due to nature of compression. PHP
-;       outputs chunks that are few hundreds bytes each as a result of
-;       compression. If you prefer a larger chunk size for better
-;       performance, enable output_buffering in addition.
-; Note: You need to use zlib.output_handler instead of the standard
-;       output_handler, or otherwise the output will be corrupted.
-zlib.output_compression = Off
-
-; You cannot specify additional output handlers if zlib.output_compression
-; is activated here. This setting does the same as output_handler but in
-; a different order.
-;zlib.output_handler =
-
-; Implicit flush tells PHP to tell the output layer to flush itself
-; automatically after every output block.  This is equivalent to calling the
-; PHP function flush() after each and every call to print() or echo() and each
-; and every HTML block.  Turning this option on has serious performance
-; implications and is generally recommended for debugging purposes only.
-implicit_flush = Off
-
-; The unserialize callback function will be called (with the undefined class'
-; name as parameter), if the unserializer finds an undefined class
-; which should be instantiated.
-; A warning appears if the specified function is not defined, or if the
-; function doesn't include/implement the missing class.
-; So only set this entry, if you really want to implement such a
-; callback-function.
-unserialize_callback_func=
-
-; When floats & doubles are serialized store serialize_precision significant
-; digits after the floating point. The default value ensures that when floats
-; are decoded with unserialize, the data will remain the same.
-serialize_precision = 100
-
-; Whether to enable the ability to force arguments to be passed by reference
-; at function call time.  This method is deprecated and is likely to be
-; unsupported in future versions of PHP/Zend.  The encouraged method of
-; specifying which arguments should be passed by reference is in the function
-; declaration.  You're encouraged to try and turn this option Off and make
-; sure your scripts work properly with it in order to ensure they will work
-; with future versions of the language (you will receive a warning each time
-; you use this feature, and the argument will be passed by value instead of by
-; reference).
-allow_call_time_pass_reference = On
-
-;
-; Safe Mode
-;
-safe_mode = Off
-
-; By default, Safe Mode does a UID compare check when
-; opening files. If you want to relax this to a GID compare,
-; then turn on safe_mode_gid.
-safe_mode_gid = Off
-
-; When safe_mode is on, UID/GID checks are bypassed when
-; including files from this directory and its subdirectories.
-; (directory must also be in include_path or full path must
-; be used when including)
-safe_mode_include_dir =
-
-; When safe_mode is on, only executables located in the safe_mode_exec_dir
-; will be allowed to be executed via the exec family of functions.
-safe_mode_exec_dir =
-
-; Setting certain environment variables may be a potential security breach.
-; This directive contains a comma-delimited list of prefixes.  In Safe Mode,
-; the user may only alter environment variables whose names begin with the
-; prefixes supplied here.  By default, users will only be able to set
-; environment variables that begin with PHP_ (e.g. PHP_FOO=BAR).
-;
-; Note:  If this directive is empty, PHP will let the user modify ANY
-; environment variable!
-safe_mode_allowed_env_vars = PHP_
-
-; This directive contains a comma-delimited list of environment variables that
-; the end user won't be able to change using putenv().  These variables will be
-; protected even if safe_mode_allowed_env_vars is set to allow to change them.
-safe_mode_protected_env_vars = LD_LIBRARY_PATH
-
-; open_basedir, if set, limits all file operations to the defined directory
-; and below.  This directive makes most sense if used in a per-directory
-; or per-virtualhost web server configuration file. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-;open_basedir =
-
-; This directive allows you to disable certain functions for security reasons.
-; It receives a comma-delimited list of function names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_functions =
-
-; This directive allows you to disable certain classes for security reasons.
-; It receives a comma-delimited list of class names. This directive is
-; *NOT* affected by whether Safe Mode is turned On or Off.
-disable_classes =
-
-; Colors for Syntax Highlighting mode.  Anything that's acceptable in
-; <span style="color: ???????"> would work.
-;highlight.string  = #DD0000
-;highlight.comment = #FF9900
-;highlight.keyword = #007700
-;highlight.bg      = #FFFFFF
-;highlight.default = #0000BB
-;highlight.html    = #000000
-
-; If enabled, the request will be allowed to complete even if the user aborts
-; the request. Consider enabling it if executing long request, which may end up
-; being interrupted by the user or a browser timing out.
-; ignore_user_abort = On
-
-; Determines the size of the realpath cache to be used by PHP. This value should
-; be increased on systems where PHP opens many files to reflect the quantity of
-; the file operations performed.
-realpath_cache_size=16k
-
-; Duration of time, in seconds for which to cache realpath information for a given
-; file or directory. For systems with rarely changing files, consider increasing this
-; value.
-realpath_cache_ttl=120
-
-;
-; Misc
-;
-; Decides whether PHP may expose the fact that it is installed on the server
-; (e.g. by adding its signature to the Web server header).  It is no security
-; threat in any way, but it makes it possible to determine whether you use PHP
-; on your server or not.
-expose_php = On
-
-
-;;;;;;;;;;;;;;;;;;;
-; Resource Limits ;
-;;;;;;;;;;;;;;;;;;;
-
-max_execution_time = 30     ; Maximum execution time of each script, in seconds
-max_input_time = 60	; Maximum amount of time each script may spend parsing request data
-memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; Error handling and logging ;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; error_reporting is a bit-field.  Or each number up to get desired error
-; reporting level
-; E_ALL             - All errors and warnings (doesn't include E_STRICT)
-; E_ERROR           - fatal run-time errors
-; E_WARNING         - run-time warnings (non-fatal errors)
-; E_PARSE           - compile-time parse errors
-; E_NOTICE          - run-time notices (these are warnings which often result
-;                     from a bug in your code, but it's possible that it was
-;                     intentional (e.g., using an uninitialized variable and
-;                     relying on the fact it's automatically initialized to an
-;                     empty string)
-; E_STRICT			- run-time notices, enable to have PHP suggest changes
-;                     to your code which will ensure the best interoperability
-;                     and forward compatibility of your code
-; E_CORE_ERROR      - fatal errors that occur during PHP's initial startup
-; E_CORE_WARNING    - warnings (non-fatal errors) that occur during PHP's
-;                     initial startup
-; E_COMPILE_ERROR   - fatal compile-time errors
-; E_COMPILE_WARNING - compile-time warnings (non-fatal errors)
-; E_USER_ERROR      - user-generated error message
-; E_USER_WARNING    - user-generated warning message
-; E_USER_NOTICE     - user-generated notice message
-;
-; Examples:
-;
-;   - Show all errors, except for notices and coding standards warnings
-;
-;error_reporting = E_ALL & ~E_NOTICE
-;
-;   - Show all errors, except for notices
-;
-;error_reporting = E_ALL & ~E_NOTICE | E_STRICT
-;
-;   - Show only errors
-;
-;error_reporting = E_COMPILE_ERROR|E_ERROR|E_CORE_ERROR
-;
-;   - Show all errors except for notices and coding standards warnings
-;
-error_reporting  =  E_ALL & ~E_NOTICE
-
-; Print out errors (as a part of the output).  For production web sites,
-; you're strongly encouraged to turn this feature off, and use error logging
-; instead (see below).  Keeping display_errors enabled on a production web site
-; may reveal security information to end users, such as file paths on your Web
-; server, your database schema or other information.
-display_errors = Off
-
-; Even when display_errors is on, errors that occur during PHP's startup
-; sequence are not displayed.  It's strongly recommended to keep
-; display_startup_errors off, except for when debugging.
-display_startup_errors = Off
-
-; Log errors into a log file (server-specific log, stderr, or error_log (below))
-; As stated above, you're strongly advised to use error logging in place of
-; error displaying on production web sites.
-log_errors = On
-
-; Set maximum length of log_errors. In error_log information about the source is
-; added. The default is 1024 and 0 allows to not apply any maximum length at all.
-log_errors_max_len = 1024
-
-; Do not log repeated messages. Repeated errors must occur in same file on same
-; line until ignore_repeated_source is set true.
-ignore_repeated_errors = Off
-
-; Ignore source of message when ignoring repeated messages. When this setting
-; is On you will not log errors with repeated messages from different files or
-; sourcelines.
-ignore_repeated_source = Off
-
-; If this parameter is set to Off, then memory leaks will not be shown (on
-; stdout or in the log). This has only effect in a debug compile, and if
-; error reporting includes E_WARNING in the allowed list
-report_memleaks = On
-
-; Store the last error/warning message in $php_errormsg (boolean).
-track_errors = Off
-
-; Disable the inclusion of HTML tags in error messages.
-; Note: Never use this feature for production boxes.
-;html_errors = Off
-
-; If html_errors is set On PHP produces clickable error messages that direct
-; to a page describing the error or function causing the error in detail.
-; You can download a copy of the PHP manual from http://www.php.net/docs.php
-; and change docref_root to the base URL of your local copy including the
-; leading '/'. You must also specify the file extension being used including
-; the dot.
-; Note: Never use this feature for production boxes.
-;docref_root = "/phpmanual/"
-;docref_ext = .html
-
-; String to output before an error message.
-;error_prepend_string = "<font color=ff0000>"
-
-; String to output after an error message.
-;error_append_string = "</font>"
-
-; Log errors to specified file.
-error_log = "/var/log/php"
-
-; Log errors to syslog (Event Log on NT, not valid in Windows 95).
-;error_log = syslog
-
-
-;;;;;;;;;;;;;;;;;
-; Data Handling ;
-;;;;;;;;;;;;;;;;;
-;
-; Note - track_vars is ALWAYS enabled as of PHP 4.0.3
-
-; The separator used in PHP generated URLs to separate arguments.
-; Default is "&".
-;arg_separator.output = "&amp;"
-
-; List of separator(s) used by PHP to parse input URLs into variables.
-; Default is "&".
-; NOTE: Every character in this directive is considered as separator!
-;arg_separator.input = ";&"
-
-; This directive describes the order in which PHP registers GET, POST, Cookie,
-; Environment and Built-in variables (G, P, C, E & S respectively, often
-; referred to as EGPCS or GPC).  Registration is done from left to right, newer
-; values override older values.
-variables_order = "EGPCS"
-
-; Whether or not to register the EGPCS variables as global variables.  You may
-; want to turn this off if you don't want to clutter your scripts' global scope
-; with user data.  This makes most sense when coupled with track_vars - in which
-; case you can access all of the GPC variables through the $HTTP_*_VARS[],
-; variables.
-;
-; You should do your best to write your scripts so that they do not require
-; register_globals to be on;  Using form variables as globals can easily lead
-; to possible security problems, if the code is not very well thought of.
-register_globals = Off
-
-; Whether or not to register the old-style input arrays, HTTP_GET_VARS
-; and friends.  If you're not using them, it's recommended to turn them off,
-; for performance reasons.
-register_long_arrays = Off
-
-; This directive tells PHP whether to declare the argv&argc variables (that
-; would contain the GET information).  If you don't use these variables, you
-; should turn it off for increased performance.
-register_argc_argv = Off
-
-; When enabled, the SERVER and ENV variables are created when they're first
-; used (Just In Time) instead of when the script starts. If these variables
-; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directives register_globals, register_long_arrays,
-; and register_argc_argv must be disabled for this directive to have any affect.
-auto_globals_jit = On
-
-; Maximum size of POST data that PHP will accept.
-post_max_size = 8M
-
-; Magic quotes
-;
-
-; Magic quotes for incoming GET/POST/Cookie data.
-magic_quotes_gpc = On
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), etc.
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
-magic_quotes_sybase = Off
-
-; Automatically add files before or after any PHP document.
-auto_prepend_file =
-auto_append_file =
-
-; As of 4.0b4, PHP always outputs a character encoding by default in
-; the Content-type: header.  To disable sending of the charset, simply
-; set it to be empty.
-;
-; PHP's built-in default is text/html
-default_mimetype = "text/html"
-;default_charset = "iso-8859-1"
-
-; Always populate the $HTTP_RAW_POST_DATA variable.
-;always_populate_raw_post_data = On
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;
-; Paths and Directories ;
-;;;;;;;;;;;;;;;;;;;;;;;;;
-
-; UNIX: "/path1:/path2"
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-
-; The root of the PHP pages, used only if nonempty.
-; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-; if you are running php as a CGI under any web server (other than IIS)
-; see documentation for security issues.  The alternate is to use the
-; cgi.force_redirect configuration below
-doc_root =
-
-; The directory under which PHP opens the script using /~username used only
-; if nonempty.
-user_dir =
-
-; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/extensions"
-
-; Whether or not to enable the dl() function.  The dl() function does NOT work
-; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-; disabled on them.
-enable_dl = On
-
-; cgi.force_redirect is necessary to provide security running PHP as a CGI under
-; most web servers.  Left undefined, PHP turns this on by default.  You can
-; turn it off here AT YOUR OWN RISK
-; **You CAN safely turn this off for IIS, in fact, you MUST.**
-; cgi.force_redirect = 1
-
-; if cgi.nph is enabled it will force cgi to always sent Status: 200 with
-; every request.
-; cgi.nph = 1
-
-; if cgi.force_redirect is turned on, and you are not running under Apache or Netscape
-; (iPlanet) web servers, you MAY need to set an environment variable name that PHP
-; will look for to know it is OK to continue execution.  Setting this variable MAY
-; cause security issues, KNOW WHAT YOU ARE DOING FIRST.
-; cgi.redirect_status_env = ;
-
-; FastCGI under IIS (on WINNT based OS) supports the ability to impersonate
-; security tokens of the calling client.  This allows IIS to define the
-; security context that the request runs under.  mod_fastcgi under Apache
-; does not currently support this feature (03/17/2002)
-; Set to 1 if running under IIS.  Default is zero.
-; fastcgi.impersonate = 1;
-
-; Disable logging through FastCGI connection
-; fastcgi.log = 0
-
-; cgi.rfc2616_headers configuration option tells PHP what type of headers to
-; use when sending HTTP response code. If it's set 0 PHP sends Status: header that
-; is supported by Apache. When this option is set to 1 PHP will send
-; RFC2616 compliant header.
-; Default is zero.
-;cgi.rfc2616_headers = 0
-
-
-;;;;;;;;;;;;;;;;
-; File Uploads ;
-;;;;;;;;;;;;;;;;
-
-; Whether to allow HTTP file uploads.
-file_uploads = On
-
-; Temporary directory for HTTP uploaded files (will use system default if not
-; specified).
-;upload_tmp_dir =
-
-; Maximum allowed size for uploaded files.
-upload_max_filesize = 2M
-
-
-;;;;;;;;;;;;;;;;;;
-; Fopen wrappers ;
-;;;;;;;;;;;;;;;;;;
-
-; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
-allow_url_fopen = On
-
-; Define the anonymous ftp password (your email address)
-;from="john@doe.com"
-
-; Define the User-Agent string
-; user_agent="PHP"
-
-; Default timeout for socket based streams (seconds)
-default_socket_timeout = 60
-
-; If your scripts have to deal with files from Macintosh systems,
-; or you are running on a Mac and need to deal with files from
-; unix or win32 systems, setting this flag will cause PHP to
-; automatically detect the EOL character in those files so that
-; fgets() and file() will work regardless of the source of the file.
-; auto_detect_line_endings = Off
-
-
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-;   extension=modulename.extension
-;
-; For example, on Windows:
-;
-;   extension=msql.dll
-;
-; ... or under UNIX:
-;
-;   extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information
-; needs to go here.  Specify the location of the extension with the
-; extension_dir directive above.
-
-
-; Windows Extensions
-; Note that ODBC support is built in, so no dll is needed for it.
-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
-; extension folders as well as the separate PECL DLL download (PHP 5).
-; Be sure to appropriately set the extension_dir directive.
-
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_curl.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
-;extension=php_filepro.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_ifx.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_ldap.dll
-;extension=php_mcrypt.dll
-;extension=php_mhash.dll
-;extension=php_mime_magic.dll
-;extension=php_ming.dll
-;extension=php_mssql.dll
-;extension=php_msql.dll
-;extension=php_mysql.dll
-;extension=php_oci8.dll
-;extension=php_openssl.dll
-;extension=php_oracle.dll
-;extension=php_pgsql.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_sockets.dll
-;extension=php_sqlite.dll
-;extension=php_sybase_ct.dll
-;extension=php_tidy.dll
-;extension=php_xmlrpc.dll
-;extension=php_xsl.dll
-
-
-;;;;;;;;;;;;;;;;;;;
-; Module Settings ;
-;;;;;;;;;;;;;;;;;;;
-
-[Date]
-; Defines the default timezone used by the date functions
-;date.timezone = 
-
-[Syslog]
-; Whether or not to define the various syslog variables (e.g. $LOG_PID,
-; $LOG_CRON, etc.).  Turning it off is a good idea performance-wise.  In
-; runtime, you can define these variables by calling define_syslog_variables().
-define_syslog_variables  = Off
-
-[mail function]
-; For Win32 only.
-SMTP = localhost
-smtp_port = 25
-
-; For Win32 only.
-;sendmail_from = me@example.com
-
-; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
-;sendmail_path =
-
-; Force the addition of the specified parameters to be passed as extra parameters
-; to the sendmail binary. These parameters will always replace the value of
-; the 5th parameter to mail(), even in safe mode.
-;mail.force_extra_parameters =
-
-[SQL]
-sql.safe_mode = Off
-
-[ODBC]
-;odbc.default_db    =  Not yet implemented
-;odbc.default_user  =  Not yet implemented
-;odbc.default_pw    =  Not yet implemented
-
-; Allow or prevent persistent links.
-odbc.allow_persistent = On
-
-; Check that a connection is still valid before reuse.
-odbc.check_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-odbc.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-odbc.max_links = -1
-
-; Handling of LONG fields.  Returns number of bytes to variables.  0 means
-; passthru.
-odbc.defaultlrl = 4096
-
-; Handling of binary data.  0 means passthru, 1 return as is, 2 convert to char.
-; See the documentation on odbc_binmode and odbc_longreadlen for an explanation
-; of uodbc.defaultlrl and uodbc.defaultbinmode
-odbc.defaultbinmode = 1
-
-[MySQL]
-; Allow or prevent persistent links.
-mysql.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-mysql.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-mysql.max_links = -1
-
-; Default port number for mysql_connect().  If unset, mysql_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
-; at MYSQL_PORT.
-mysql.default_port =
-
-; Default socket name for local MySQL connects.  If empty, uses the built-in
-; MySQL defaults.
-mysql.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysql.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysql.default_user =
-
-; Default password for mysql_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysql.default_password")
-; and reveal this password!  And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysql.default_password =
-
-; Maximum time (in secondes) for connect timeout. -1 means no limit
-mysql.connect_timeout = 60
-
-; Trace mode. When trace_mode is active (=On), warnings for table/index scans and
-; SQL-Errors will be displayed.
-mysql.trace_mode = Off
-
-[MySQLi]
-
-; Maximum number of links.  -1 means no limit.
-mysqli.max_links = -1
-
-; Default port number for mysqli_connect().  If unset, mysqli_connect() will use
-; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the
-; compile-time value defined MYSQL_PORT (in that order).  Win32 will only look
-; at MYSQL_PORT.
-mysqli.default_port = 3306
-
-; Default socket name for local MySQL connects.  If empty, uses the built-in
-; MySQL defaults.
-mysqli.default_socket =
-
-; Default host for mysql_connect() (doesn't apply in safe mode).
-mysqli.default_host =
-
-; Default user for mysql_connect() (doesn't apply in safe mode).
-mysqli.default_user =
-
-; Default password for mysqli_connect() (doesn't apply in safe mode).
-; Note that this is generally a *bad* idea to store passwords in this file.
-; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw")
-; and reveal this password!  And of course, any users with read access to this
-; file will be able to reveal the password as well.
-mysqli.default_pw =
-
-; Allow or prevent reconnect
-mysqli.reconnect = Off
-
-[mSQL]
-; Allow or prevent persistent links.
-msql.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-msql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent).  -1 means no limit.
-msql.max_links = -1
-
-[PostgresSQL]
-; Allow or prevent persistent links.
-pgsql.allow_persistent = On
-
-; Detect broken persistent links always with pg_pconnect().
-; Auto reset feature requires a little overheads.
-pgsql.auto_reset_persistent = Off
-
-; Maximum number of persistent links.  -1 means no limit.
-pgsql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent).  -1 means no limit.
-pgsql.max_links = -1
-
-; Ignore PostgreSQL backends Notice message or not.
-; Notice message logging require a little overheads.
-pgsql.ignore_notice = 0
-
-; Log PostgreSQL backends Noitce message or not.
-; Unless pgsql.ignore_notice=0, module cannot log notice message.
-pgsql.log_notice = 0
-
-[Sybase]
-; Allow or prevent persistent links.
-sybase.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-sybase.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-sybase.max_links = -1
-
-;sybase.interface_file = "/usr/sybase/interfaces"
-
-; Minimum error severity to display.
-sybase.min_error_severity = 10
-
-; Minimum message severity to display.
-sybase.min_message_severity = 10
-
-; Compatability mode with old versions of PHP 3.0.
-; If on, this will cause PHP to automatically assign types to results according
-; to their Sybase type, instead of treating them all as strings.  This
-; compatibility mode will probably not stay around forever, so try applying
-; whatever necessary changes to your code, and turn it off.
-sybase.compatability_mode = Off
-
-[Sybase-CT]
-; Allow or prevent persistent links.
-sybct.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-sybct.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-sybct.max_links = -1
-
-; Minimum server message severity to display.
-sybct.min_server_severity = 10
-
-; Minimum client message severity to display.
-sybct.min_client_severity = 10
-
-[bcmath]
-; Number of decimal digits for all bcmath functions.
-bcmath.scale = 0
-
-[browscap]
-;browscap = extra/browscap.ini
-
-[Informix]
-; Default host for ifx_connect() (doesn't apply in safe mode).
-ifx.default_host =
-
-; Default user for ifx_connect() (doesn't apply in safe mode).
-ifx.default_user =
-
-; Default password for ifx_connect() (doesn't apply in safe mode).
-ifx.default_password =
-
-; Allow or prevent persistent links.
-ifx.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-ifx.max_persistent = -1
-
-; Maximum number of links (persistent + non-persistent).  -1 means no limit.
-ifx.max_links = -1
-
-; If on, select statements return the contents of a text blob instead of its id.
-ifx.textasvarchar = 0
-
-; If on, select statements return the contents of a byte blob instead of its id.
-ifx.byteasvarchar = 0
-
-; Trailing blanks are stripped from fixed-length char columns.  May help the
-; life of Informix SE users.
-ifx.charasvarchar = 0
-
-; If on, the contents of text and byte blobs are dumped to a file instead of
-; keeping them in memory.
-ifx.blobinfile = 0
-
-; NULL's are returned as empty strings, unless this is set to 1.  In that case,
-; NULL's are returned as string 'NULL'.
-ifx.nullformat = 0
-
-[Session]
-; Handler used to store/retrieve data.
-session.save_handler = files
-
-; Argument passed to save_handler.  In the case of files, this is the path
-; where data files are stored. Note: Windows users have to change this
-; variable in order to use PHP's session functions.
-;
-; As of PHP 4.0.1, you can define the path as:
-;
-;     session.save_path = "N;/path"
-;
-; where N is an integer.  Instead of storing all the session files in
-; /path, what this will do is use subdirectories N-levels deep, and
-; store the session data in those directories.  This is useful if you
-; or your OS have problems with lots of files in one directory, and is
-; a more efficient layout for servers that handle lots of sessions.
-;
-; NOTE 1: PHP will not create this directory structure automatically.
-;         You can use the script in the ext/session dir for that purpose.
-; NOTE 2: See the section on garbage collection below if you choose to
-;         use subdirectories for session storage
-;
-; The file storage module creates files using mode 600 by default.
-; You can change that by using
-;
-;     session.save_path = "N;MODE;/path"
-;
-; where MODE is the octal representation of the mode. Note that this
-; does not overwrite the process's umask.
-;session.save_path = "/tmp"
-
-; Whether to use cookies.
-session.use_cookies = 1
-
-; This option enables administrators to make their users invulnerable to
-; attacks which involve passing session ids in URLs; defaults to 0.
-; session.use_only_cookies = 1
-
-; Name of the session (used as cookie name).
-session.name = PHPSESSID
-
-; Initialize session on request startup.
-session.auto_start = 0
-
-; Lifetime in seconds of cookie or, if 0, until browser is restarted.
-session.cookie_lifetime = 0
-
-; The path for which the cookie is valid.
-session.cookie_path = /
-
-; The domain for which the cookie is valid.
-session.cookie_domain =
-
-; Handler used to serialize data.  php is the standard serializer of PHP.
-session.serialize_handler = php
-
-; Define the probability that the 'garbage collection' process is started
-; on every session initialization.
-; The probability is calculated by using gc_probability/gc_divisor,
-; e.g. 1/100 means there is a 1% chance that the GC process starts
-; on each request.
-
-session.gc_probability = 1
-session.gc_divisor     = 100
-
-; After this number of seconds, stored data will be seen as 'garbage' and
-; cleaned up by the garbage collection process.
-session.gc_maxlifetime = 1440
-
-; NOTE: If you are using the subdirectory option for storing session files
-;       (see session.save_path above), then garbage collection does *not*
-;       happen automatically.  You will need to do your own garbage
-;       collection through a shell script, cron entry, or some other method.
-;       For example, the following script would is the equivalent of
-;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
-;          cd /path/to/sessions; find -cmin +24 | xargs rm
-
-; PHP 4.2 and less have an undocumented feature/bug that allows you to
-; to initialize a session variable in the global scope, albeit register_globals
-; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
-; You can disable the feature and the warning separately. At this time,
-; the warning is only displayed, if bug_compat_42 is enabled.
-
-session.bug_compat_42 = 1
-session.bug_compat_warn = 1
-
-; Check HTTP Referer to invalidate externally stored URLs containing ids.
-; HTTP_REFERER has to contain this substring for the session to be
-; considered as valid.
-session.referer_check =
-
-; How many bytes to read from the file.
-session.entropy_length = 0
-
-; Specified here to create the session id.
-session.entropy_file =
-
-;session.entropy_length = 16
-
-;session.entropy_file = /dev/urandom
-
-; Set to {nocache,private,public,} to determine HTTP caching aspects
-; or leave this empty to avoid sending anti-caching headers.
-session.cache_limiter = nocache
-
-; Document expires after n minutes.
-session.cache_expire = 180
-
-; trans sid support is disabled by default.
-; Use of trans sid may risk your users security.
-; Use this option with caution.
-; - User may send URL contains active session ID
-;   to other person via. email/irc/etc.
-; - URL that contains active session ID may be stored
-;   in publically accessible computer.
-; - User may access your site with the same session ID
-;   always using URL stored in browser's history or bookmarks.
-session.use_trans_sid = 0
-
-; Select a hash function
-; 0: MD5   (128 bits)
-; 1: SHA-1 (160 bits)
-session.hash_function = 0
-
-; Define how many bits are stored in each character when converting
-; the binary hash data to something readable.
-;
-; 4 bits: 0-9, a-f
-; 5 bits: 0-9, a-v
-; 6 bits: 0-9, a-z, A-Z, "-", ","
-session.hash_bits_per_character = 4
-
-; The URL rewriter will look for URLs in a defined set of HTML tags.
-; form/fieldset are special; if you include them here, the rewriter will
-; add a hidden <input> field with the info which is otherwise appended
-; to URLs.  If you want XHTML conformity, remove the form entry.
-; Note that all valid entries require a "=", even if no value follows.
-url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=,fieldset="
-
-[MSSQL]
-; Allow or prevent persistent links.
-mssql.allow_persistent = On
-
-; Maximum number of persistent links.  -1 means no limit.
-mssql.max_persistent = -1
-
-; Maximum number of links (persistent+non persistent).  -1 means no limit.
-mssql.max_links = -1
-
-; Minimum error severity to display.
-mssql.min_error_severity = 10
-
-; Minimum message severity to display.
-mssql.min_message_severity = 10
-
-; Compatability mode with old versions of PHP 3.0.
-mssql.compatability_mode = Off
-
-; Connect timeout
-;mssql.connect_timeout = 5
-
-; Query timeout
-;mssql.timeout = 60
-
-; Valid range 0 - 2147483647.  Default = 4096.
-;mssql.textlimit = 4096
-
-; Valid range 0 - 2147483647.  Default = 4096.
-;mssql.textsize = 4096
-
-; Limits the number of records in each batch.  0 = all records in one batch.
-;mssql.batchsize = 0
-
-; Specify how datetime and datetim4 columns are returned
-; On => Returns data converted to SQL server settings
-; Off => Returns values as YYYY-MM-DD hh:mm:ss
-;mssql.datetimeconvert = On
-
-; Use NT authentication when connecting to the server
-mssql.secure_connection = Off
-
-; Specify max number of processes. -1 = library default
-; msdlib defaults to 25
-; FreeTDS defaults to 4096
-;mssql.max_procs = -1
-
-; Specify client character set. 
-; If empty or not set the client charset from freetds.comf is used
-; This is only used when compiled with FreeTDS
-;mssql.charset = "ISO-8859-1"
-
-[Assertion]
-; Assert(expr); active by default.
-;assert.active = On
-
-; Issue a PHP warning for each failed assertion.
-;assert.warning = On
-
-; Don't bail out by default.
-;assert.bail = Off
-
-; User-function to be called if an assertion fails.
-;assert.callback = 0
-
-; Eval the expression with current error_reporting().  Set to true if you want
-; error_reporting(0) around the eval().
-;assert.quiet_eval = 0
-
-[Verisign Payflow Pro]
-; Default Payflow Pro server.
-pfpro.defaulthost = "test-payflow.verisign.com"
-
-; Default port to connect to.
-pfpro.defaultport = 443
-
-; Default timeout in seconds.
-pfpro.defaulttimeout = 30
-
-; Default proxy IP address (if required).
-;pfpro.proxyaddress =
-
-; Default proxy port.
-;pfpro.proxyport =
-
-; Default proxy logon.
-;pfpro.proxylogon =
-
-; Default proxy password.
-;pfpro.proxypassword =
-
-[COM]
-; path to a file containing GUIDs, IIDs or filenames of files with TypeLibs
-;com.typelib_file =
-; allow Distributed-COM calls
-;com.allow_dcom = true
-; autoregister constants of a components typlib on com_load()
-;com.autoregister_typelib = true
-; register constants casesensitive
-;com.autoregister_casesensitive = false
-; show warnings on duplicate constat registrations
-;com.autoregister_verbose = true
-
-[mbstring]
-; language for internal character representation.
-;mbstring.language = Japanese
-
-; internal/script encoding.
-; Some encoding cannot work as internal encoding.
-; (e.g. SJIS, BIG5, ISO-2022-*)
-;mbstring.internal_encoding = EUC-JP
-
-; http input encoding.
-;mbstring.http_input = auto
-
-; http output encoding. mb_output_handler must be
-; registered as output buffer to function
-;mbstring.http_output = SJIS
-
-; enable automatic encoding translation according to
-; mbstring.internal_encoding setting. Input chars are
-; converted to internal encoding by setting this to On.
-; Note: Do _not_ use automatic encoding translation for
-;       portable libs/applications.
-;mbstring.encoding_translation = Off
-
-; automatic encoding detection order.
-; auto means
-;mbstring.detect_order = auto
-
-; substitute_character used when character cannot be converted
-; one from another
-;mbstring.substitute_character = none;
-
-; overload(replace) single byte functions by mbstring functions.
-; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(),
-; etc. Possible values are 0,1,2,4 or combination of them.
-; For example, 7 for overload everything.
-; 0: No overload
-; 1: Overload mail() function
-; 2: Overload str*() functions
-; 4: Overload ereg*() functions
-;mbstring.func_overload = 0
-
-; enable strict encoding detection.
-;mbstring.strict_encoding = Off
-
-[FrontBase]
-;fbsql.allow_persistent = On
-;fbsql.autocommit = On
-;fbsql.show_timestamp_decimals = Off
-;fbsql.default_database =
-;fbsql.default_database_password =
-;fbsql.default_host =
-;fbsql.default_password =
-;fbsql.default_user = "_SYSTEM"
-;fbsql.generate_warnings = Off
-;fbsql.max_connections = 128
-;fbsql.max_links = 128
-;fbsql.max_persistent = -1
-;fbsql.max_results = 128
-;fbsql.batchSize = 1000
-
-[gd]
-; Tell the jpeg decode to libjpeg warnings and try to create
-; a gd image. The warning will then be displayed as notices
-; disabled by default
-;gd.jpeg_ignore_warning = 0
- 
-[exif]
-; Exif UNICODE user comments are handled as UCS-2BE/UCS-2LE and JIS as JIS.
-; With mbstring support this will automatically be converted into the encoding
-; given by corresponding encode setting. When empty mbstring.internal_encoding
-; is used. For the decode settings you can distinguish between motorola and
-; intel byte order. A decode setting cannot be empty.
-;exif.encode_unicode = ISO-8859-15
-;exif.decode_unicode_motorola = UCS-2BE
-;exif.decode_unicode_intel    = UCS-2LE
-;exif.encode_jis =
-;exif.decode_jis_motorola = JIS
-;exif.decode_jis_intel    = JIS
-
-[Tidy]
-; The path to a default tidy configuration file to use when using tidy
-;tidy.default_config = /usr/local/lib/php/default.tcfg
-
-; Should tidy clean and repair output automatically?
-; WARNING: Do not use this option if you are generating non-html content
-; such as dynamic images
-tidy.clean_output = Off
-
-[soap]
-; Enables or disables WSDL caching feature.
-soap.wsdl_cache_enabled=1
-; Sets the directory name where SOAP extension will put cache files.
-soap.wsdl_cache_dir="/tmp"
-; (time to live) Sets the number of second while cached file will be used 
-; instead of original one.
-soap.wsdl_cache_ttl=86400
-
-; Local Variables:
-; tab-width: 4
-; End: