diff options
| author | Olly Betts <olly@survex.com> | 2016-01-12 09:33:39 +1300 |
|---|---|---|
| committer | Olly Betts <olly@survex.com> | 2016-01-12 09:33:39 +1300 |
| commit | 22b72d5da34e95ef7d423c902936c01156a23171 (patch) | |
| tree | 13167f25fc727a6449b874148d3910d55bc78163 | |
| parent | b3bedc210c723b29314688a87385797f7888fad3 (diff) | |
| download | swig-22b72d5da34e95ef7d423c902936c01156a23171.tar.gz | |
[Javascript] Look for "nodejs" as well as "node", as it's packaged
as the former on Debian.
| -rw-r--r-- | CHANGES.current | 4 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES.current b/CHANGES.current index d925e5ffc..e114acd09 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -6,6 +6,10 @@ Version 3.0.9 (in progress) =========================== 2016-01-12: olly + [Javascript] Look for "nodejs" as well as "node", as it's packaged + as the former on Debian. + +2016-01-12: olly [Javascript] For v8 >= 4.3.0, use V8_MAJOR_VERSION. Fixes https://github.com/swig/swig/issues/561. diff --git a/configure.ac b/configure.ac index 9dfdcbd9b..8b537461c 100644 --- a/configure.ac +++ b/configure.ac @@ -1422,7 +1422,7 @@ else # Look for Node.js which is the default Javascript engine #---------------------------------------------------------------- - AC_CHECK_PROGS(NODEJS, node) + AC_CHECK_PROGS(NODEJS, [nodejs node]) if test -n "$NODEJS"; then # node-gyp is needed to run the test-suite/examples |