projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
flush
[m6w6/ext-psi]
/
config.m4
diff --git
a/config.m4
b/config.m4
index 991550584e99eef07506cf760d61c1c102323964..816511fd09e764bda0eb402191dabea591bb0f3a 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-1,4
+1,4
@@
-PHP_ARG_
ENABLE
(psi, whether to enable psi support,
+PHP_ARG_
WITH
(psi, whether to enable psi support,
[ --with-psi[[=path to libjit]]
Enable PHP System Interface support])
[ --with-psi[[=path to libjit]]
Enable PHP System Interface support])
@@
-8,7
+8,7
@@
if test "$PHP_PSI" != "no"; then
PHP_SUBST(LEMON)
AC_CACHE_CHECK(for libjit install root, PSI_cv_LIBJIT_DIR, [
PHP_SUBST(LEMON)
AC_CACHE_CHECK(for libjit install root, PSI_cv_LIBJIT_DIR, [
- for PSI_cv_LIBJIT_DIR in {/usr{,/local},/opt}{,libjit}
+ for PSI_cv_LIBJIT_DIR in
$PHP_PSI
{/usr{,/local},/opt}{,libjit}
do
if test -e $PSI_cv_LIBJIT_DIR/include/jit/jit.h
then
do
if test -e $PSI_cv_LIBJIT_DIR/include/jit/jit.h
then
@@
-21,6
+21,10
@@
if test "$PHP_PSI" != "no"; then
AC_MSG_ERROR([Could not find libjit, please provide the base install path])
fi
AC_MSG_ERROR([Could not find libjit, please provide the base install path])
fi
+ PHP_ADD_INCLUDE($PSI_cv_LIBJIT_DIR/include)
+ PHP_ADD_LIBRARY_WITH_PATH(jit, $PSI_cv_LIBJIT_DIR/$PHP_LIBDIR, PSI_SHARED_LIBADD)
+ PHP_SUBST(PSI_SHARED_LIBADD)
+
PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
PHP_PSI_SRCDIR=PHP_EXT_SRCDIR(psi)
PHP_PSI_BUILDDIR=PHP_EXT_BUILDDIR(psi)
@@
-29,7
+33,7
@@
if test "$PHP_PSI" != "no"; then
PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && echo *.h)`
PHP_PSI_SOURCES=`(cd $PHP_PSI_SRCDIR && echo src/*.c)`
PHP_PSI_HEADERS=`(cd $PHP_PSI_SRCDIR/src && echo *.h)`
PHP_PSI_SOURCES=`(cd $PHP_PSI_SRCDIR && echo src/*.c)`
- PHP_PSI_SOURCES=
"src/parser.c src/parser_proc.c"
+ PHP_PSI_SOURCES=
`(echo $PHP_PSI_SOURCES src/parser.c src/parser_proc.c | xargs -n1 | sort | uniq)`
PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)
PHP_NEW_EXTENSION(psi, $PHP_PSI_SOURCES, $ext_shared)
PHP_INSTALL_HEADERS(ext/psi, php_psi.h $PHP_PSI_HEADERS)