Remove javascript autoconf detection (Temporarily).

I want to cut it down to a minimum having only nodejs.
We will activate the others (native JSC and V8) later.
This commit is contained in:
Oliver Buchtala 2013-09-03 18:24:19 +02:00
commit da48f3307f

View file

@ -1089,207 +1089,6 @@ if test x"${with_javascript}" = xno -o x"${with_alllang}" = xno ; then
JAVASCRIPT=
fi
### JavascriptCore ###
# check for include files
AC_MSG_CHECKING(for include file JavaScriptCore/JavaScript.h)
AC_ARG_WITH(javascriptincl, [ --with-javascript=path Set location of Javascript include directory], [JSCOREINCDIR="$withval"], [JSCOREINCDIR=])
if test -z "$JSCOREINCDIR"; then
JSCOREINCDIR="/usr/include/ /usr/local/include/"
# Add in default directory for JavaScriptCore headers for Linux and MacOSX
case $host in
*-*-linux*) JSCOREINCDIR="/usr/include/webkit-1.0/ /usr/include/webkitgtk-1.0/ /usr/local/include/webkit-1.0/JavaScriptCore/ $JSCOREINCDIR";;
*-*-darwin*) JSCOREINCDIR="/System/Library/Frameworks/JavaScriptCore.framework/Headers/ $JSCOREINCDIR";;
*);;
esac
fi
JSCORE=0
for d in $JSCOREINCDIR ; do
if test -r "$d/JavaScriptCore/JavaScript.h" || test -r "$d/JavaScript.h" ; then
AC_MSG_RESULT($d)
JSCOREINCDIR=$d
JSCOREINC=-I\"$d\"
JSCORE=1
break
fi
done
if test "$JSCOREINC" = "" ; then
AC_MSG_RESULT(not found)
fi
# under linux look for the javascript core library
case $host in
*-*-linux*)
# check for JavaScriptCore, Webkit libraries
AC_ARG_WITH(jscorelib,[ --with-jscorelib =path Set location of JavaScriptCore (Webkit) library directory], [JSCORELIB="-L$withval"], [JSCORELIB=])
AC_MSG_CHECKING(for JavaScriptCore(Webkit) library)
if test -z "$JSCORELIB"; then
JSCORELIBDIRS="/usr/lib/ /usr/local/lib/"
for i in $JSCORELIBDIRS ; do
if test -r $i/libwebkit-1.0.la; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -lwebkit-1.0"
break
fi
if test -r $i/libjavascriptcoregtk-1.0.so; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -ljavascriptcoregtk-1.0"
break
fi
if test -r $i/libwebkitgtk-1.0.so; then
AC_MSG_RESULT($i)
JSCORELIB="-L$i -lwebkitgtk-1.0"
break
fi
done
fi
if test -z "$JSCORELIB"; then
AC_MSG_RESULT(not found)
JSCORE=0
else
AC_MSG_RESULT($JSCORELIB)
JSCORE=1
fi
;;
esac
# linking options
case $host in
*-*-darwin*)
JSCOREDYNAMICLINKING="-framework JavaScriptCore"
JSCORECFLAGS=""
;;
*-*-linux*)
JSCOREDYNAMICLINKING="$JSCORELIB"
JSCORECFLAGS=""
;;
*)
JSCOREDYNAMICLINKING=""
JSCORECFLAGS=""
;;
esac
# JSCORELIBRARYPREFIX
case $host in
*-*-cygwin* | *-*-mingw*) JSCORELIBRARYPREFIX="";;
*) JSCORELIBRARYPREFIX="lib";;
esac
if test "$JS_NO_WARNINGS" == "1"; then
case $host in
*-*-darwin* | *-*-linux* | *-*-cygwin* | *-*-mingw*)
JSCXXFLAGS="`echo $CXXFLAGS | sed 's/-Wall//g'`"
;;
*)
JSCXXFLAGS="$CXXFLAGS"
esac
fi
# library output
case $host in
*-*-darwin*)
JSCORESO=".dylib"
JSCORELDSHARED='$(CC) -dynamiclib'
JSCORECXXSHARED='$(CXX) -dynamiclib'
;;
*)
JSCORESO=$SO
JSCORELDSHARED='$(LDSHARED)'
JSCORECXXSHARED='$(CXXSHARED)'
;;
esac
AC_SUBST(JSCORE)
AC_SUBST(JSCOREINC)
AC_SUBST(JSCOREDYNAMICLINKING)
AC_SUBST(JSCORELIBRARYPREFIX)
AC_SUBST(JSCORECFLAGS)
AC_SUBST(JSCORESO)
AC_SUBST(JSCORELDSHARED)
AC_SUBST(JSCORECXXSHARED)
AC_SUBST(JSCXXFLAGS)
### V8 ###
# check for include files
AC_MSG_CHECKING(for include file v8.h)
AC_ARG_WITH(v8inc, [ --with-v8inc=path Set location of Javascript include directory], [JSV8INCDIR="$withval"])
if test -z "$JSV8INCDIR"; then
# Add in default directory for JavaScriptCore headers for Linux and MacOSX
case $host in
*-*-linux*) JSV8INCDIR="/usr/include /usr/local/include/ $JSV8INCDIR";;
*-*-darwin*) JSV8INCDIR="$JSV8INCDIR";; #TODO: add configuration for osx
*);;
esac
fi
for d in $JSV8INCDIR ; do
if test -r "$d/v8.h" ; then
AC_MSG_RESULT($d)
JSV8INCDIR=$d
JSV8INC=-I\"$d\"
break
fi
done
if test "$JSV8INC" = "" ; then
AC_MSG_RESULT(not found)
JSV8=
else
JSV8=1
fi
# check for V8 library
AC_MSG_CHECKING(for v8 library)
AC_ARG_WITH(v8lib,[ --with-v8lib=path Set location of V8 library directory],[JSV8LIBDIR="$withval"], [JSV8LIB=])
v8libdirs="$JSV8LIBDIR /usr/lib/ /usr/local/lib/"
for i in $v8libdirs ; do
if test -r $i/libv8.so; then
JSV8LIB="-L$i -lv8"
break
fi
done
if test "$JSV8LIB" = "" ; then
AC_MSG_RESULT(not found)
JSV8=
else
AC_MSG_RESULT($JSV8LIB)
JSV8=1
fi
# linking options
case $host in
*-*-darwin*)
JSV8DYNAMICLINKING="" # TODO: add osx configuration
;;
*-*-linux*)
JSV8DYNAMICLINKING="$JSV8LIB"
;;
*)
JSV8DYNAMICLINKING=""
;;
esac
AC_SUBST(JSV8)
AC_SUBST(JSV8INC)
AC_SUBST(JSV8DYNAMICLINKING)
AC_SUBST(JSDEFAULT)
#----------------------------------------------------------------
# Look for gcj
#----------------------------------------------------------------
@ -2451,18 +2250,6 @@ fi
AC_SUBST(SKIP_JAVA)
SKIP_JAVASCRIPT=
if test -z "$JSCOREINC" && test -z "$JSV8INC"; then
# Add in default directory for JavaScriptCore headers for Linux and MacOSX
case $host in
*-*-linux*) if test -z "$JSCORELIB" && test -z "$JSV8LIB"; then
SKIP_JAVASCRIPT="1"
fi
;;
*-*-darwin*)SKIP_JAVASCRIPT="1"
;;
*);;
esac
fi
AC_SUBST(SKIP_JAVASCRIPT)
SKIP_GUILE=