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

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

See https://github.com/swig/swig/pull/1796