projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
autoconf: split into subdirectories; redirect calls in debug builds
[m6w6/ext-psi]
/
config.m4
diff --git
a/config.m4
b/config.m4
index f9cf24d14bceb6527a05c2e3eb2106dec2bb6360..f5c82c1c91350b27b038afb6035483ec23175848 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-2,41
+2,41
@@
PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
m4_foreach(incfile, [
PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
m4_foreach(incfile, [
- [ax_check_sign.m4],
- [ax_pthread.m4],
- [psi.m4],
- [psi_type.m4],
- [psi_const.m4],
- [psi_decl.m4],
- [psi_macro.m4],
- [psi_struct.m4],
- [errno.m4],
- [fcntl.m4],
- [glob.m4],
- [locale.m4],
- [stddef.m4],
- [stdio.m4],
- [stdint.m4],
- [stdlib.m4],
- [sys_select.m4],
- [sys_socket.m4],
- [sys_stat.m4],
- [sys_time.m4],
- [sys_times.m4],
- [sys_types.m4],
- [sys_uio.m4],
- [sys_utsname.m4],
- [ndbm.m4],
- [netdb.m4],
- [netinet_in.m4],
- [netinet_tcp.m4],
- [poll.m4],
- [signal.m4],
- [syslog.m4],
- [time.m4],
- [unistd.m4],
- [wchar.m4],
- [wctype.m4]], [
+ [ax
/ax
_check_sign.m4],
+ [ax
/ax
_pthread.m4],
+ [psi
/psi
.m4],
+ [psi
/psi
_type.m4],
+ [psi
/psi
_const.m4],
+ [psi
/psi
_decl.m4],
+ [psi
/psi
_macro.m4],
+ [psi
/psi
_struct.m4],
+ [
posix/
errno.m4],
+ [
posix/
fcntl.m4],
+ [
posix/
glob.m4],
+ [
posix/
locale.m4],
+ [
posix/
stddef.m4],
+ [
posix/
stdio.m4],
+ [
posix/
stdint.m4],
+ [
posix/
stdlib.m4],
+ [
posix/
sys_select.m4],
+ [
posix/
sys_socket.m4],
+ [
posix/
sys_stat.m4],
+ [
posix/
sys_time.m4],
+ [
posix/
sys_times.m4],
+ [
posix/
sys_types.m4],
+ [
posix/
sys_uio.m4],
+ [
posix/
sys_utsname.m4],
+ [
posix/
ndbm.m4],
+ [
posix/
netdb.m4],
+ [
posix/
netinet_in.m4],
+ [
posix/
netinet_tcp.m4],
+ [po
six/po
ll.m4],
+ [
posix/
signal.m4],
+ [
posix/
syslog.m4],
+ [
posix/
time.m4],
+ [
posix/
unistd.m4],
+ [
posix/
wchar.m4],
+ [
posix/
wctype.m4]], [
dnl pecl build
sinclude([m4/]incfile)
dnl php-src build
dnl pecl build
sinclude([m4/]incfile)
dnl php-src build
@@
-111,14
+111,16
@@
if test "$PHP_PSI" != no; then
AC_DEFINE_UNQUOTED([PSI_VA_DECLS], [$PSI_VA_DECLS], [Predefined vararg functions])
PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
AC_DEFINE_UNQUOTED([PSI_VA_DECLS], [$PSI_VA_DECLS], [Predefined vararg functions])
PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src)
+ PHP_ADD_INCLUDE($PHP_PSI_SRCDIR/src/types)
PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src)
+ PHP_ADD_BUILD_DIR($PHP_PSI_BUILDDIR/src/types)
PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)`
# parser* should come first
PHP_PSI_SOURCES=" \
src/parser_proc.c \
src/parser.c \
PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)`
# parser* should come first
PHP_PSI_SOURCES=" \
src/parser_proc.c \
src/parser.c \
- `(cd $PHP_PSI_SRCDIR && ls src/*.c | $EGREP -v '^src/parser')` \
+ `(cd $PHP_PSI_SRCDIR && ls src/*.c
src/types/*.c
| $EGREP -v '^src/parser')` \
"
PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
"
PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)