Commit c01f24f

committed

Split include and lib directory variables

Solves #522 Solves #529

1 parent ccf94d8 commit c01f24fCopy full SHA for c01f24f

File tree

1 file changed

+15

-13

lines changed

config.m4

1 file changed

+15

-13

lines changed

`‎config.m4`

Lines changed: 15 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ PHP_ARG_WITH(v8js, for V8 Javascript Engine,`
`3`	`3`
`4`	`4`	`if test "$PHP_V8JS" != "no"; then`
`5`	`5`	`SEARCH_PATH="/usr/local /usr"`
`6`		`- SEARCH_FOR="$PHP_LIBDIR/libv8.$SHLIB_SUFFIX_NAME"`
`7`		`-`
	`6`	`+ SEARCH_FOR="libv8.$SHLIB_SUFFIX_NAME"`
	`7`	`+`
`8`	`8`	`if test -r $PHP_V8JS/$SEARCH_FOR; then`
`9`	`9`	`case $host_os in`
`10`	`10`	`darwin* )`
`@@ -14,26 +14,28 @@ if test "$PHP_V8JS" != "no"; then`
`14`	`14`	`LDFLAGS="$LDFLAGS -Wl,--rpath=$PHP_V8JS/$PHP_LIBDIR"`
`15`	`15`	`;;`
`16`	`16`	`esac`
`17`		`- V8_DIR=$PHP_V8JS`
	`17`	`+ V8_INCLUDE_DIR=$PHP_V8JS/include/v8`
	`18`	`+ V8_LIBRARY_DIR=$PHP_V8JS/$PHP_LIBDIR`
`18`	`19`	`else`
`19`	`20`	`AC_MSG_CHECKING([for V8 files in default path])`
`20`	`21`	`for i in $SEARCH_PATH ; do`
`21`		`- if test -r $i/$SEARCH_FOR; then`
`22`		`- V8_DIR=$i`
	`22`	`+ if test -r $i/$PHP_LIBDIR/$SEARCH_FOR; then`
	`23`	`+ V8_INCLUDE_DIR=$i/include/v8`
	`24`	`+ V8_LIBRARY_DIR=$i/$PHP_LIBDIR`
`23`	`25`	`AC_MSG_RESULT(found in $i)`
`24`	`26`	`fi`
`25`	`27`	`done`
`26`	`28`	`fi`
`27`	`29`
`28`		`- AC_DEFINE_UNQUOTED([PHP_V8_EXEC_PATH], "$V8_DIR/$SEARCH_FOR", [Full path to libv8 library file])`
	`30`	`+ AC_DEFINE_UNQUOTED([PHP_V8_EXEC_PATH], "$V8_LIBRARY_DIR/$SEARCH_FOR", [Full path to libv8 library file])`
`29`	`31`
`30`		`- if test -z "$V8_DIR"; then`
	`32`	`+ if test -z "$V8_INCLUDE_DIR" \|\| test -z "$V8_LIBRARY_DIR"; then`
`31`	`33`	`AC_MSG_RESULT([not found])`
`32`	`34`	`AC_MSG_ERROR([Please reinstall the v8 distribution])`
`33`	`35`	`fi`
`34`	`36`
`35`		`- PHP_ADD_INCLUDE($V8_DIR/include)`
`36`		`- PHP_ADD_LIBRARY_WITH_PATH(v8, $V8_DIR/$PHP_LIBDIR, V8JS_SHARED_LIBADD)`
	`37`	`+ PHP_ADD_INCLUDE($V8_INCLUDE_DIR)`
	`38`	`+ PHP_ADD_LIBRARY_WITH_PATH(v8, $V8_LIBRARY_DIR, V8JS_SHARED_LIBADD)`
`37`	`39`	`PHP_SUBST(V8JS_SHARED_LIBADD)`
`38`	`40`	`PHP_REQUIRE_CXX()`
`39`	`41`
`@@ -89,8 +91,8 @@ if test "$PHP_V8JS" != "no"; then`
`89`	`91`
`90`	`92`	`AC_LANG_PUSH([C++])`
`91`	`93`
`92`		`- CPPFLAGS="$CPPFLAGS -I$V8_DIR/include -std=$ac_cv_v8_cstd"`
`93`		`- LDFLAGS="$LDFLAGS -L$V8_DIR/$PHP_LIBDIR"`
	`94`	`+ CPPFLAGS="$CPPFLAGS -I$V8_INCLUDE_DIR -std=$ac_cv_v8_cstd"`
	`95`	`+ LDFLAGS="$LDFLAGS -L$V8_LIBRARY_DIR"`
`94`	`96`
`95`	`97`	`AC_MSG_CHECKING([for libv8_libplatform])`
`96`	`98`	`AC_DEFUN([V8_CHECK_LINK], [`
`@@ -161,7 +163,7 @@ int main ()`
`161`	`163`	`AC_MSG_CHECKING([for 1ドル])`
`162`	`164`	`blob_found=0`
`163`	`165`
`164`		`- for i in "$V8_DIR/$PHP_LIBDIR" "$V8_DIR/share/v8"; do`
	`166`	`+ for i in "$V8_LIBRARY_DIR" "$V8_INCLUDE_DIR/../share/v8"; do`
`165`	`167`	`if test -r "$i/1ドル"; then`
`166`	`168`	`AC_MSG_RESULT([found ($i/1ドル)])`
`167`	`169`	`AC_DEFINE_UNQUOTED([2ドル], "$i/1ドル", [Full path to 1ドル file])`
`@@ -219,7 +221,7 @@ int main ()`
`219`	`221`
`220`	`222`	`AC_DEFINE([V8_DEPRECATION_WARNINGS], [1], [Enable compiler warnings when using V8_DEPRECATED apis.])`
`221`	`223`
`222`		`- PHP_ADD_INCLUDE($V8_DIR)`
	`224`	`+ PHP_ADD_INCLUDE($V8_INCLUDE_DIR)`
`223`	`225`	`PHP_NEW_EXTENSION(v8js, [ \`
`224`	`226`	`v8js_array_access.cc \`
`225`	`227`	`v8js_class.cc \`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit c01f24f

File tree

1 file changed

1 file changed

`‎config.m4`

0 commit comments