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

Merge branch 'master' of https://github.com/vapier/swig

Browse source 
Use $PKGCONFIG instead of hard-coded pkg-config for JS test.

See https://github.com/swig/swig/pull/1796
This commit is contained in:
Vadim Zeitlin 2020-05-24 22:06:21 +02:00
commit 034a6d54ee
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGES.current
View file

@ -7,6 +7,9 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
Version 4.0.2 (in progress) Version 4.0.2 (in progress)
=========================== ===========================
2020-05-24: vapier
[JS] #1796 Fix pkg-config invocation in configure.
2020-02-18: ryannevell 2020-02-18: ryannevell
[Lua] #1728 Add support for LUA lightuserdata to SWIG_Lua_ConvertPtr. [Lua] #1728 Add support for LUA lightuserdata to SWIG_Lua_ConvertPtr.

2
configure.ac
View file

@ -1597,7 +1597,7 @@ else
if test -z "$JSCORELIB" -a -n "$PKGCONFIG"; then if test -z "$JSCORELIB" -a -n "$PKGCONFIG"; then
AC_MSG_CHECKING(for JavaScriptCore/Webkit library) AC_MSG_CHECKING(for JavaScriptCore/Webkit library)
if pkg-config javascriptcoregtk-1.0; then if $PKGCONFIG javascriptcoregtk-1.0; then
JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0` JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0`
JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0` JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0`
fi fi