diff options
| author | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2014-03-06 06:29:00 +0100 |
|---|---|---|
| committer | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2014-03-06 06:29:00 +0100 |
| commit | 57491eaa8189205d0bcd77decd90d2097b1341d5 (patch) | |
| tree | 5a44cf10d2498d667305b97811ef86d2cd1374ed /configure.ac | |
| parent | c91b28b908b5d530e8848591220a2d81bcf7a316 (diff) | |
| download | swig-57491eaa8189205d0bcd77decd90d2097b1341d5.tar.gz | |
Add 'version' target for javascript.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 1d5d9ace7..9b1d3205d 100644 --- a/configure.ac +++ b/configure.ac @@ -1145,6 +1145,8 @@ else AC_MSG_CHECKING(for include file JavaScriptCore/JavaScript.h) AC_ARG_WITH(jscoreinc, [ --with-jscinc=path Set location of Javascript include directory], [JSCOREINCDIR="$withval"], [JSCOREINCDIR=]) + JSCOREVERSION= + if test -z "$JSCOREINCDIR"; then JSCOREINCDIR="/usr/include/ /usr/local/include/" @@ -1187,18 +1189,7 @@ else 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 - - if test -r $i/libwebkit-1.0.la; then - AC_MSG_RESULT($i) - JSCORELIB="-L$i -lwebkit-1.0" + JSCOREVERSION=`pkg-config --modversion javascriptcoregtk-1.0` break fi done @@ -1306,12 +1297,15 @@ AC_SUBST(JSINTERPRETERLINKFLAGS) AC_SUBST(JSCOREINC) AC_SUBST(JSCOREDYNAMICLINKING) +AC_SUBST(JSCOREVERSION) AC_SUBST(JSV8INC) AC_SUBST(JSV8DYNAMICLINKING) AC_SUBST(JSCENABLED) AC_SUBST(JSV8ENABLED) +AC_SUBST(NODEJS) + #---------------------------------------------------------------- # Look for gcj #---------------------------------------------------------------- |