diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2014-12-04 06:23:43 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2014-12-04 06:23:43 +0000 |
| commit | 5b480847dd5fbc6b98a41154c70ac1806cfd25d9 (patch) | |
| tree | 3e0e36eb0d8db3a83a71167ac38745b363abd8ea /configure.ac | |
| parent | 3d85dfba9a3af5926974436322740f6228b6e6eb (diff) | |
| download | swig-5b480847dd5fbc6b98a41154c70ac1806cfd25d9.tar.gz | |
Improve Javascript Webkit detection
pkg-config detection was missing. Use pkg-config for the link flags.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/configure.ac b/configure.ac index b05933527..4633f8ed0 100644 --- a/configure.ac +++ b/configure.ac @@ -461,6 +461,8 @@ fi]) AC_ARG_WITH(alllang, AS_HELP_STRING([--without-alllang], [Disable all languages]), with_alllang="$withval") +AC_CHECK_PROGS(PKGCONFIG, [pkg-config]) + #-------------------------------------------------------------------- # Look for Tcl #-------------------------------------------------------------------- @@ -1203,37 +1205,21 @@ else # check for JavaScriptCore/Webkit libraries AC_ARG_WITH(jscorelib,[ --with-jsclib =path Set location of the JavaScriptCore/Webkit library directory],[JSCORELIB="-L$withval"], [JSCORELIB=]) - AC_MSG_CHECKING(for JavaScriptCore/Webkit library) - - # look for the library when not provided - if test -z "$JSCORELIB"; then - case $host in - *-*-linux*) - dirs="/usr/lib64/ /usr/local/lib64/ /usr/lib/ /usr/local/lib/" - for i in $dirs ; do - if test -r $i/libjavascriptcoregtk-1.0.so; then - AC_MSG_RESULT($i) - JSCORELIB="-L$i -ljavascriptcoregtk-1.0" - JSCOREVERSION=`pkg-config --modversion javascriptcoregtk-1.0` - break - fi - done - if test -z "$JSCORELIB"; then - AC_MSG_RESULT(not found) - JSCENABLED= - else - JSCOREDYNAMICLINKING="$JSCORELIB" - JSCENABLED=1 - fi - ;; - *-*-darwin*) - JSCOREDYNAMICLINKING="-framework JavaScriptCore" + if test -z "$JSCORELIB" -a -n "$PKGCONFIG"; then + AC_MSG_CHECKING(for JavaScriptCore/Webkit library) + if pkg-config javascriptcoregtk-1.0; then + JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0` + JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0` + fi + if test -z "$JSCORELIB"; then + AC_MSG_RESULT(not found) + JSCENABLED= + else + AC_MSG_RESULT([$JSCORELIB]) + JSCOREDYNAMICLINKING="$JSCORELIB" JSCENABLED=1 - ;; - *) - ;; - esac + fi fi #---------------------------------------------------------------- |