@@ -43,7 +43,7 @@ if test "$PHP_V8JS" != "no"; then
4343 old_CPPFLAGS=$CPPFLAGS
4444 AC_LANG_PUSH ( [ C++] )
4545 CPPFLAGS="-std="$ac_cv_v8_cstd
46- AC_TRY_RUN ( [ int main() { return 0; }] ,[ ] ,[ ac_cv_v8_cstd="c++0x"] ,[ ] )
46+ AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [ int main() { return 0; }] ] ) ] ,[ ] ,[ ac_cv_v8_cstd="c++0x"] ,[ ] )
4747 AC_LANG_POP ( [ C++] )
4848 CPPFLAGS=$old_CPPFLAGS
4949 ] ) ;
@@ -53,27 +53,27 @@ if test "$PHP_V8JS" != "no"; then
5353 old_CXXFLAGS=$CXXFLAGS
5454 AC_LANG_PUSH ( [ C++] )
5555 CXXFLAGS="-std="$ac_cv_v8_cstd
56- AC_TRY_RUN ( [ int main() {
56+ AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [ int main() {
5757 struct { unsigned int x; } foo = {-1};
5858 (void) foo;
5959 return 0;
60- }] , [ ac_cv_v8_narrowing="" ] , [
60+ }] ] ) ] , [ ac_cv_v8_narrowing=""] , [
6161 CXXFLAGS="-Wno-c++11-narrowing -std="$ac_cv_v8_cstd
62- AC_TRY_RUN ( [ int main() {
62+ AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [ int main() {
6363 struct { unsigned int x; } foo = {-1};
6464 (void) foo;
6565 return 0;
66- }] , [ ac_cv_v8_narrowing="-Wno-c++11-narrowing" ] , [
66+ }] ] ) ] , [ ac_cv_v8_narrowing="-Wno-c++11-narrowing"] , [
6767 CXXFLAGS="-Wno-narrowing -std="$ac_cv_v8_cstd
68- AC_TRY_RUN ( [ int main() {
68+ AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [ int main() {
6969 struct { unsigned int x; } foo = {-1};
7070 (void) foo;
7171 return 0;
72- }] , [ ac_cv_v8_narrowing="-Wno-narrowing" ] , [
72+ }] ] ) ] , [ ac_cv_v8_narrowing="-Wno-narrowing"] , [
7373 AC_MSG_ERROR ( [ cannot compile with narrowing] )
74- ] , [ ] )
75- ] , [ ] )
76- ] , [ ] )
74+ ] ,[ ] )
75+ ] ,[ ] )
76+ ] ,[ ] )
7777 AC_LANG_POP ( [ C++] )
7878 CXXFLAGS=$old_CXXFLAGS
7979 ] ) ;
@@ -83,8 +83,7 @@ if test "$PHP_V8JS" != "no"; then
8383 old_LDFLAGS=$LDFLAGS
8484 old_CPPFLAGS=$CPPFLAGS
8585
86- AC_LANG_SAVE
87- AC_LANG_CPLUSPLUS
86+ AC_LANG_PUSH ( [ C++] )
8887
8988 CPPFLAGS="$CPPFLAGS -I$V8_DIR/include -std=$ac_cv_v8_cstd"
9089 LDFLAGS="$LDFLAGS -L$V8_DIR/$PHP_LIBDIR"
@@ -117,7 +116,7 @@ if test "$PHP_V8JS" != "no"; then
117116 dnl
118117 LIBS="$LIBS $V8JS_SHARED_LIBADD"
119118 AC_CACHE_CHECK ( for V8 version , ac_cv_v8_version , [
120- AC_TRY_RUN ( [ #include <v8.h>
119+ AC_RUN_IFELSE ( [ AC_LANG_SOURCE ( [ [ #include <v8.h>
121120#include <iostream>
122121#include <fstream>
123122using namespace std;
@@ -132,7 +131,7 @@ int main ()
132131 return 0;
133132 }
134133 return 1;
135- }] , [ ac_cv_v8_version=`cat ./conftestval|awk '{print $1 }'`] , [ ac_cv_v8_version=NONE] , [ ac_cv_v8_version=NONE] )
134+ }] ] ) ] , [ ac_cv_v8_version=`cat ./conftestval|awk '{print $1 }'`] ,[ ac_cv_v8_version=NONE] ,[ ac_cv_v8_version=NONE] )
136135] )
137136
138137 if test "$ac_cv_v8_version" != "NONE"; then
@@ -197,7 +196,7 @@ int main ()
197196 [ Define unless v8::ArrayBuffer::Allocator::NewDefaultAllocator is usable.] )
198197 fi
199198
200- AC_LANG_RESTORE
199+ AC_LANG_POP ( [ C++ ] )
201200 LIBS=$old_LIBS
202201 LDFLAGS="$old_LDFLAGS"
203202 CPPFLAGS=$old_CPPFLAGS
0 commit comments