Skip to content

Commit 034a6d5

Browse files
committed
Merge branch 'master' of https://github.com/vapier/swig
Use $PKGCONFIG instead of hard-coded pkg-config for JS test. See swig#1796
2 parents f422302 + 48842cb commit 034a6d5

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

CHANGES.current

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
77
Version 4.0.2 (in progress)
88
===========================
99

10+
2020-05-24: vapier
11+
[JS] #1796 Fix pkg-config invocation in configure.
12+
1013
2020-02-18: ryannevell
1114
[Lua] #1728 Add support for LUA lightuserdata to SWIG_Lua_ConvertPtr.
1215

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1597,7 +1597,7 @@ else
15971597

15981598
if test -z "$JSCORELIB" -a -n "$PKGCONFIG"; then
15991599
AC_MSG_CHECKING(for JavaScriptCore/Webkit library)
1600-
if pkg-config javascriptcoregtk-1.0; then
1600+
if $PKGCONFIG javascriptcoregtk-1.0; then
16011601
JSCORELIB=`$PKGCONFIG --libs javascriptcoregtk-1.0`
16021602
JSCOREVERSION=`$PKGCONFIG --modversion javascriptcoregtk-1.0`
16031603
fi

0 commit comments

Comments
 (0)