diff options
| author | Marcus Boerger <helly@php.net> | 2008-02-17 20:50:03 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2008-02-17 20:50:03 +0000 |
| commit | 2633dcab4648bb8120096a29fa291237510d4808 (patch) | |
| tree | dc18e7fd14459191ef7c4889e5e854604f2bd051 /acinclude.m4 | |
| parent | 22392affefd36c47876f23157e7539e51fea6805 (diff) | |
| download | php-git-2633dcab4648bb8120096a29fa291237510d4808.tar.gz | |
- MFH Allow zend_extensions to be build inside ext and tested with 'make test'
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 62baa98da3..ee2ef97a95 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -837,7 +837,7 @@ AC_DEFUN([PHP_BUILD_PROGRAM],[ ]) dnl -dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx) +dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx, zend_ext) dnl dnl Basically sets up the link-stage for building module-name dnl from object_var in build-dir. @@ -860,7 +860,11 @@ AC_DEFUN([PHP_SHARED_MODULE],[ ;; esac - PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.$suffix" + if test "x$5" = "xyes"; then + PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/$1.$suffix" + else + PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.$suffix" + fi PHP_SUBST($2) cat >>Makefile.objects<<EOF \$(phplibdir)/$1.$suffix: $3/$1.$suffix @@ -916,7 +920,7 @@ AC_DEFUN([PHP_GEN_BUILD_DIRS],[ ]) dnl -dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx]]]]) +dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, cxx[, zend_ext]]]]]) dnl dnl Includes an extension in the build. dnl @@ -949,10 +953,10 @@ dnl ---------------------------------------------- Shared module PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes) case $host_alias in *netware*[)] - PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6) + PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6, $7) ;; *[)] - PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6) + PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6, $7) ;; esac AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to build $1 as dynamic module) |