Skip to content

Commit c01f24f

Browse files
committedSep 7, 2024
Split include and lib directory variables
Solves phpv8#522 Solves phpv8#529
1 parent ccf94d8 commit c01f24f

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed
 

‎config.m4

+15-13
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ PHP_ARG_WITH(v8js, for V8 Javascript Engine,
33

44
if test "$PHP_V8JS" != "no"; then
55
SEARCH_PATH="/usr/local /usr"
6-
SEARCH_FOR="$PHP_LIBDIR/libv8.$SHLIB_SUFFIX_NAME"
7-
6+
SEARCH_FOR="libv8.$SHLIB_SUFFIX_NAME"
7+
88
if test -r $PHP_V8JS/$SEARCH_FOR; then
99
case $host_os in
1010
darwin* )
@@ -14,26 +14,28 @@ if test "$PHP_V8JS" != "no"; then
1414
LDFLAGS="$LDFLAGS -Wl,--rpath=$PHP_V8JS/$PHP_LIBDIR"
1515
;;
1616
esac
17-
V8_DIR=$PHP_V8JS
17+
V8_INCLUDE_DIR=$PHP_V8JS/include/v8
18+
V8_LIBRARY_DIR=$PHP_V8JS/$PHP_LIBDIR
1819
else
1920
AC_MSG_CHECKING([for V8 files in default path])
2021
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
2325
AC_MSG_RESULT(found in $i)
2426
fi
2527
done
2628
fi
2729

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])
2931

30-
if test -z "$V8_DIR"; then
32+
if test -z "$V8_INCLUDE_DIR" || test -z "$V8_LIBRARY_DIR"; then
3133
AC_MSG_RESULT([not found])
3234
AC_MSG_ERROR([Please reinstall the v8 distribution])
3335
fi
3436

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)
3739
PHP_SUBST(V8JS_SHARED_LIBADD)
3840
PHP_REQUIRE_CXX()
3941

@@ -89,8 +91,8 @@ if test "$PHP_V8JS" != "no"; then
8991

9092
AC_LANG_PUSH([C++])
9193

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"
9496

9597
AC_MSG_CHECKING([for libv8_libplatform])
9698
AC_DEFUN([V8_CHECK_LINK], [
@@ -161,7 +163,7 @@ int main ()
161163
AC_MSG_CHECKING([for $1])
162164
blob_found=0
163165
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
165167
if test -r "$i/$1"; then
166168
AC_MSG_RESULT([found ($i/$1)])
167169
AC_DEFINE_UNQUOTED([$2], "$i/$1", [Full path to $1 file])
@@ -219,7 +221,7 @@ int main ()
219221

220222
AC_DEFINE([V8_DEPRECATION_WARNINGS], [1], [Enable compiler warnings when using V8_DEPRECATED apis.])
221223

222-
PHP_ADD_INCLUDE($V8_DIR)
224+
PHP_ADD_INCLUDE($V8_INCLUDE_DIR)
223225
PHP_NEW_EXTENSION(v8js, [ \
224226
v8js_array_access.cc \
225227
v8js_class.cc \

0 commit comments

Comments
 (0)
Please sign in to comment.