--- embedaddon/php/main/php_config.h.in	2013/07/22 01:44:16	1.1.1.2.2.1
+++ embedaddon/php/main/php_config.h.in	2013/07/22 01:32:11	1.1.1.3
@@ -25,9 +25,6 @@
 #undef BETHREADS
 
 /* */
-#undef BUGGY_SNMPRINT_VALUE
-
-/* */
 #undef CDB_INCLUDE_FILE
 
 /* Define if system uses EBCDIC */
@@ -756,6 +753,12 @@
 #undef HAVE_GD_IMAGESETTILE
 
 /* */
+#undef HAVE_GD_IMAGE_CONVOLUTION
+
+/* */
+#undef HAVE_GD_IMAGE_PIXELATE
+
+/* */
 #undef HAVE_GD_JPG
 
 /* */
@@ -1366,6 +1369,9 @@
 /* PostgreSQL 7.2.0 or later */
 #undef HAVE_PQESCAPE
 
+/* PostgreSQL 9.0 or later */
+#undef HAVE_PQESCAPELITERAL
+
 /* PostgreSQL 8.1.4 or later */
 #undef HAVE_PQESCAPE_BYTEA_CONN
 
@@ -1495,6 +1501,9 @@
 /* */
 #undef HAVE_SAPDB
 
+/* Whether you have sockaddr_storage.ss_family */
+#undef HAVE_SA_SS_FAMILY
+
 /* Define to 1 if you have the `scandir' function. */
 #undef HAVE_SCANDIR
 
@@ -1750,16 +1759,16 @@
 /* whether you have struct flock */
 #undef HAVE_STRUCT_FLOCK
 
-/* Define to 1 if `st_blksize' is a member of `struct stat'. */
+/* Define to 1 if `st_blksize' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLKSIZE
 
-/* Define to 1 if `st_blocks' is a member of `struct stat'. */
+/* Define to 1 if `st_blocks' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_BLOCKS
 
-/* Define to 1 if `st_rdev' is a member of `struct stat'. */
+/* Define to 1 if `st_rdev' is member of `struct stat'. */
 #undef HAVE_STRUCT_STAT_ST_RDEV
 
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
+/* Define to 1 if `tm_zone' is member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_ZONE
 
 /* Define to 1 if your `struct stat' has `st_blksize'. Deprecated, use
@@ -1795,6 +1804,12 @@
 /* Define to 1 if you have the <syslog.h> header file. */
 #undef HAVE_SYSLOG_H
 
+/* FPM use systemd integration */
+#undef HAVE_SYSTEMD
+
+/* Define to 1 if you have the <systemd/sd-daemon.h> header file. */
+#undef HAVE_SYSTEMD_SD_DAEMON_H
+
 /* */
 #undef HAVE_SYSVMSG
 
@@ -1970,7 +1985,7 @@
 /* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
 #undef HAVE_UTIME_NULL
 
-/* Wether struct utsname has domainname */
+/* Whether struct utsname has domainname */
 #undef HAVE_UTSNAME_DOMAINNAME
 
 /* Define to 1 if you have the `vasprintf' function. */
@@ -2108,9 +2123,6 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -2147,6 +2159,9 @@
 /* fpm group name */
 #undef PHP_FPM_GROUP
 
+/* fpm systemd service type */
+#undef PHP_FPM_SYSTEMD
+
 /* fpm user name */
 #undef PHP_FPM_USER
 
@@ -2270,6 +2285,9 @@
 /* */
 #undef SOLARIS
 
+/* have sqlite3 with column metadata enabled */
+#undef SQLITE_ENABLE_COLUMN_METADATA
+
 /* have sqlite3 with extension support */
 #undef SQLITE_OMIT_LOAD_EXTENSION
 
@@ -2320,28 +2338,6 @@
 /* Define if cross-process locking is required by accept() */
 #undef USE_LOCKING
 
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# undef _ALL_SOURCE
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# undef _GNU_SOURCE
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# undef _POSIX_PTHREAD_SEMANTICS
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# undef _TANDEM_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
-
-
 /* */
 #undef USE_TRANSFER_TABLES
 
@@ -2354,12 +2350,6 @@
 /* Define if processor uses big-endian word */
 #undef WORDS_BIGENDIAN
 
-/* Include external shared modules configurations */
-#include "ext/php_config.h"
-
-/* Include external shared modules configurations */
-#include "ext/php_config.h"
-
 /* Whether sprintf is broken */
 #undef ZEND_BROKEN_SPRINTF
 
@@ -2384,15 +2374,12 @@
 /* */
 #undef ZTS
 
-/* Define to 1 if on MINIX. */
-#undef _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#undef _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#undef _POSIX_SOURCE
+/* Define to 1 if on AIX 3.
+   System headers sometimes define this.
+   We just want to avoid a redefinition error message.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const