jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve Javascript Webkit detection

Browse source 
pkg-config detection was missing. Use pkg-config for the link flags.
This commit is contained in:
William S Fulton 2014-12-04 06:23:43 +00:00
commit 5b480847dd
1 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

44
configure.ac
View file

@ -461,6 +461,8 @@ fi])
AC_ARG_WITH(alllang, AS_HELP_STRING([--without-alllang], [Disable all languages]), with_alllang="$withval") AC_ARG_WITH(alllang, AS_HELP_STRING([--without-alllang], [Disable all languages]), with_alllang="$withval")
AC_CHECK_PROGS(PKGCONFIG, [pkg-config])
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Look for Tcl # Look for Tcl
#-------------------------------------------------------------------- #--------------------------------------------------------------------
@ -1203,37 +1205,21 @@ else
# check for JavaScriptCore/Webkit libraries # 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_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" -a -n "$PKGCONFIG"; then
if test -z "$JSCORELIB"; then AC_MSG_CHECKING(for JavaScriptCore/Webkit library)
case $host in if pkg-config javascriptcoregtk-1.0; then
*-*-linux*) JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0`
dirs="/usr/lib64/ /usr/local/lib64/ /usr/lib/ /usr/local/lib/" JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0`
for i in $dirs ; do fi
if test -r $i/libjavascriptcoregtk-1.0.so; then if test -z "$JSCORELIB"; then
AC_MSG_RESULT($i) AC_MSG_RESULT(not found)
JSCORELIB="-L$i -ljavascriptcoregtk-1.0" JSCENABLED=
JSCOREVERSION=`pkg-config --modversion javascriptcoregtk-1.0` else
break AC_MSG_RESULT([$JSCORELIB])
fi JSCOREDYNAMICLINKING="$JSCORELIB"
done
if test -z "$JSCORELIB"; then
AC_MSG_RESULT(not found)
JSCENABLED=
else
JSCOREDYNAMICLINKING="$JSCORELIB"
JSCENABLED=1
fi
;;
*-*-darwin*)
JSCOREDYNAMICLINKING="-framework JavaScriptCore"
JSCENABLED=1 JSCENABLED=1
;; fi
*)
;;
esac
fi fi
#---------------------------------------------------------------- #----------------------------------------------------------------