projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix clang build
[m6w6/ext-psi]
/
config.m4
diff --git
a/config.m4
b/config.m4
index d621ffc5766e10a6a9163ec1978f5067aa074cfd..f63f52d926b90b40bdf703c10cd0714278f294a8 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-1,12
+1,3
@@
-PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
-
-case "PHP_EXT_BUILDDIR(psi)" in
-""|.) PHP_PSI_BUILDDIR=$PHP_PSI_SRCDIR
- ;;
-*) PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
- ;;
-esac
-
m4_foreach(incfile, [
[ax/ax_check_sign.m4],
[ax/ax_pthread.m4],
m4_foreach(incfile, [
[ax/ax_check_sign.m4],
[ax/ax_pthread.m4],
@@
-52,15
+43,24
@@
if test "$PHP_PSI" != no; then
])
AC_MSG_CHECKING([psi source dir])
])
AC_MSG_CHECKING([psi source dir])
+ PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
AC_MSG_RESULT([$PHP_PSI_SRCDIR])
AC_MSG_RESULT([$PHP_PSI_SRCDIR])
+
AC_MSG_CHECKING([psi build dir])
AC_MSG_CHECKING([psi build dir])
+ case "PHP_EXT_BUILDDIR(psi)" in
+ ""|.) PHP_PSI_BUILDDIR=$PHP_PSI_SRCDIR
+ ;;
+ *) PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
+ ;;
+ esac
AC_MSG_RESULT([$PHP_PSI_BUILDDIR])
AC_MSG_RESULT([$PHP_PSI_BUILDDIR])
-
+
PSI_CHECK_LIBJIT
PSI_CHECK_LIBFFI
AC_FUNC_FNMATCH
AC_FUNC_MMAP
PSI_CHECK_LIBJIT
PSI_CHECK_LIBFFI
AC_FUNC_FNMATCH
AC_FUNC_MMAP
+ AC_CHECK_FUNCS([mknodat eaccess])
PSI_CONFIG_INIT
PSI_CHECK_STD_TYPES
PSI_CONFIG_INIT
PSI_CHECK_STD_TYPES
@@
-83,15
+83,15
@@
if test "$PHP_PSI" != no; then
src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)` \
"
src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
`(cd $PHP_PSI_SRCDIR/src && ls *.h types/*.h)` \
"
- # parser* should come first
+ # parser
_
* should come first
PHP_PSI_SOURCES=" \
PHP_PSI_SOURCES=" \
- src/parser_proc.c src/parser.c \
+ src/parser_proc.c src/parser
_scan
.c \
`(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c \
`(cd $PHP_PSI_SRCDIR && ls src/*.c src/types/*.c \
- | $EGREP -v '^src/parser' \
+ | $EGREP -v '^src/parser
_
' \
)` \
"
PHP_PSI_GENERATED=" \
)` \
"
PHP_PSI_GENERATED=" \
- src/parser_proc.c src/parser.c \
+ src/parser_proc.c src/parser
_scan
.c \
src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
"
src/calc/basic.h src/calc/bin.h src/calc/bool.h src/calc/cast.h \
src/calc/unary.h src/calc/cmp.h src/calc/oper.h \
"