Fix configuration_in for detecting v8 include and lib.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13821 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
2092793868
commit
8948360725
1 changed files with 11 additions and 19 deletions
30
configure.in
30
configure.in
|
|
@ -1215,11 +1215,9 @@ AC_SUBST(JSCXXFLAGS)
|
||||||
|
|
||||||
# check for include files
|
# check for include files
|
||||||
AC_MSG_CHECKING(for include file v8.h)
|
AC_MSG_CHECKING(for include file v8.h)
|
||||||
AC_ARG_WITH(javascriptv8incl, [ --with-javascript-v8=path Set location of Javascript include directory], [JSV8INCDIR="$withval"], [JSV8INCDIR=])
|
AC_ARG_WITH(v8inc, [ --with-v8inc=path Set location of Javascript include directory], [JSV8INCDIR="$withval"])
|
||||||
|
|
||||||
if test -z "$JSV8INCDIR"; then
|
if test -z "$JSV8INCDIR"; then
|
||||||
JSV8INCDIR="/usr/include/ /usr/local/include/"
|
|
||||||
|
|
||||||
# Add in default directory for JavaScriptCore headers for Linux and MacOSX
|
# Add in default directory for JavaScriptCore headers for Linux and MacOSX
|
||||||
case $host in
|
case $host in
|
||||||
*-*-linux*) JSV8INCDIR="/usr/include /usr/local/include/ $JSV8INCDIR";;
|
*-*-linux*) JSV8INCDIR="/usr/include /usr/local/include/ $JSV8INCDIR";;
|
||||||
|
|
@ -1243,27 +1241,21 @@ fi
|
||||||
|
|
||||||
|
|
||||||
# check for V8 library
|
# check for V8 library
|
||||||
AC_ARG_WITH(jsv8lib,[ --with-jsv8lib =path Set location of V8 library directory],[
|
AC_MSG_CHECKING(for v8 library)
|
||||||
JSV8LIB="-L$withval"], [JSV8LIB=])
|
AC_ARG_WITH(v8lib,[ --with-v8lib=path Set location of V8 library directory],[JSV8LIBDIR="$withval"], [JSV8LIB=])
|
||||||
AC_MSG_CHECKING(for V8 library)
|
|
||||||
|
|
||||||
if test -z "$JSV8LIB"; then
|
v8libdirs="$JSV8LIBDIR /usr/lib/ /usr/local/lib/"
|
||||||
dirs="/usr/lib/ /usr/local/lib/"
|
for i in $v8libdirs ; do
|
||||||
for i in $dirs ; do
|
if test -r $i/libv8.so; then
|
||||||
|
JSV8LIB="-L$i -lv8"
|
||||||
if test -r $i/libv8.so; then
|
break
|
||||||
AC_MSG_RESULT($i)
|
fi
|
||||||
JSV8LIB="-L$i -lv8"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
|
|
||||||
if test "$JSV8LIB" = "" ; then
|
if test "$JSV8LIB" = "" ; then
|
||||||
AC_MSG_RESULT(not found)
|
AC_MSG_RESULT(not found)
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT($JSCORELIB)
|
AC_MSG_RESULT($JSV8LIB)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue