|
Lines 1-28
Link Here
|
| 1 |
--- config.m4.orig Mon Dec 4 19:01:53 2006 |
1 |
--- config.m4-orig 2010-05-28 08:48:52.292495018 +0000 |
| 2 |
+++ config.m4 Wed Feb 7 12:21:20 2007 |
2 |
+++ config.m4 2010-05-28 08:50:38.168968425 +0000 |
| 3 |
@@ -4,6 +4,11 @@ |
3 |
@@ -1,6 +1,11 @@ |
| 4 |
PHP_ARG_ENABLE(spl, enable SPL suppport, |
4 |
dnl $Id: config.m4 268395 2008-11-06 00:37:13Z colder $ |
| 5 |
[ --disable-spl Disable Standard PHP Library], yes) |
5 |
dnl config.m4 for extension SPL |
| 6 |
|
6 |
|
| 7 |
+if test -z "$PHP_LIBXML_DIR"; then |
7 |
+if test -z "$PHP_LIBXML_DIR"; then |
| 8 |
+ PHP_ARG_WITH(libxml-dir, libxml2 install dir, |
8 |
+ PHP_ARG_WITH(libxml-dir, libxml2 install dir, |
| 9 |
+ [ --with-libxml-dir=DIR SPL: libxml2 install prefix], no, no) |
9 |
+ [ --with-libxml-dir=DIR SPL: libxml2 install prefix], no, no) |
| 10 |
+fi |
10 |
+fi |
| 11 |
+ |
11 |
+ |
| 12 |
if test "$PHP_SPL" != "no"; then |
|
|
| 13 |
AC_MSG_CHECKING(whether zend_object_value is packed) |
12 |
AC_MSG_CHECKING(whether zend_object_value is packed) |
| 14 |
old_CPPFLAGS=$CPPFLAGS |
13 |
old_CPPFLAGS=$CPPFLAGS |
| 15 |
@@ -25,8 +30,12 @@ |
14 |
CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" |
|
|
15 |
@@ -21,7 +26,11 @@ |
| 16 |
]) |
16 |
]) |
| 17 |
CPPFLAGS=$old_CPPFLAGS |
17 |
CPPFLAGS=$old_CPPFLAGS |
| 18 |
AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed]) |
18 |
AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed]) |
| 19 |
+ PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [ |
19 |
+ PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [ |
| 20 |
AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) |
20 |
AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) |
| 21 |
- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, no) |
21 |
- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, no) |
| 22 |
+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, yes) |
22 |
+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c, yes) |
| 23 |
PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_sxe.h]) |
23 |
PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h]) |
| 24 |
PHP_ADD_EXTENSION_DEP(spl, pcre, true) |
24 |
PHP_ADD_EXTENSION_DEP(spl, pcre, true) |
| 25 |
+ ], [ |
25 |
+ ], [ |
| 26 |
+ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) |
26 |
+ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) |
| 27 |
+ ]) |
27 |
+ ]) |
| 28 |
fi |
|
|