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

configure.ac: pick up javascriptcoregtk-4.0,3.0 if available.

Browse source 
Ubuntu 20 doesn't have libwebkitgtk-dev/libjavascriptcoregtk-1.0-dev,
but it has 4.0. Ubuntu 18 provides 3.0 as option.
This commit is contained in:
Andy Polyakov 2021-02-28 22:41:55 +01:00
commit 1abb726d69
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tools/javascript/jsc_shell.cxx
View file

@ -18,7 +18,7 @@ typedef int (*JSCIntializer)(JSGlobalContextRef context, JSObjectRef *module);
public: public:
JSCShell() {}; JSCShell() { context = 0; };
virtual ~JSCShell(); virtual ~JSCShell();

10
configure.ac
View file

@ -1600,7 +1600,15 @@ else
if test -z "$JSCORELIB" -a -n "$PKG_CONFIG "; then if test -z "$JSCORELIB" -a -n "$PKG_CONFIG "; then
AC_MSG_CHECKING(for JavaScriptCore/Webkit library) AC_MSG_CHECKING(for JavaScriptCore/Webkit library)
if $PKG_CONFIG javascriptcoregtk-1.0; then if $PKG_CONFIG javascriptcoregtk-4.0; then
JSCORELIB=`$PKG_CONFIG --libs javascriptcoregtk-4.0`
JSCOREINC=`$PKG_CONFIG --cflags-only-I javascriptcoregtk-4.0`
JSCOREVERSION=`$PKG_CONFIG --modversion javascriptcoregtk-4.0`
elif $PKG_CONFIG javascriptcoregtk-3.0; then
JSCORELIB=`$PKG_CONFIG --libs javascriptcoregtk-3.0`
JSCOREINC=`$PKG_CONFIG --cflags-only-I javascriptcoregtk-3.0`
JSCOREVERSION=`$PKG_CONFIG --modversion javascriptcoregtk-3.0`
elif $PKG_CONFIG javascriptcoregtk-1.0; then
JSCORELIB=`$PKG_CONFIG --libs javascriptcoregtk-1.0` JSCORELIB=`$PKG_CONFIG --libs javascriptcoregtk-1.0`
JSCOREVERSION=`$PKG_CONFIG --modversion javascriptcoregtk-1.0` JSCOREVERSION=`$PKG_CONFIG --modversion javascriptcoregtk-1.0`
fi fi