diff options
| author | Sascha Schumann <sas@php.net> | 2002-03-13 09:20:49 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2002-03-13 09:20:49 +0000 |
| commit | e10ca1008460a04202c4c2429778f34cc76477c0 (patch) | |
| tree | 0cf939b19caef0133c60304faea26140d2273a15 /acinclude.m4 | |
| parent | 1599932c2e77e79e3cf3e85d19fb8ee175a91305 (diff) | |
| download | php-git-e10ca1008460a04202c4c2429778f34cc76477c0.tar.gz | |
Provide context-specific functions which yield the directories
of extensions (PHP 4 configure vs. self-contained module)
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d4b6361728..9d5435266c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1077,7 +1077,7 @@ AC_DEFUN(PHP_SELECT_SAPI,[ dnl deprecated AC_DEFUN(PHP_EXTENSION,[ - sources=`awk -f $abs_srcdir/scan_makefile_in.awk < $abs_srcdir/ext/$1/Makefile.in` + sources=`awk -f $abs_srcdir/scan_makefile_in.awk < []PHP_EXT_SRCDIR($1)[]/Makefile.in` PHP_NEW_EXTENSION($1, $sources, $2, $3) @@ -1111,15 +1111,8 @@ dnl be set to "cli" to mark extension build only with CLI or CGI sapi's. dnl extra-cflags are passed to the compiler, with @ext_srcdir@ being dnl substituted. AC_DEFUN(PHP_NEW_EXTENSION,[ - if test -d "$abs_srcdir/ext/$1"; then -dnl ---------------------------------------------- Internal Module - ext_builddir=ext/$1 - ext_srcdir=$abs_srcdir/ext/$1 - else -dnl ---------------------------------------------- External Module - ext_builddir=. - ext_srcdir=$abs_srcdir - fi + ext_builddir=[]PHP_EXT_BUILDDIR($1) + ext_srcdir=[]PHP_EXT_SRCDIR($1) ifelse($5,,,[ac_extra=`echo $ac_n "$5$ac_c"|sed s#@ext_srcdir@#$ext_srcdir#g`]) |