diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 6bdc77184..4b0ab6859 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -52,6 +52,10 @@ Tests:: * scripts: add scripting API tests (issue #104) * unit: display an error if the required locale en_US.UTF-8 is not installed +Build:: + + * javascript: fix detection of libv8 with autotools on Ubuntu Trusty + [[v1.9.1]] == Version 1.9.1 (2017-09-23) diff --git a/configure.ac b/configure.ac index 57d6132d4..6744a3a43 100644 --- a/configure.ac +++ b/configure.ac @@ -888,8 +888,8 @@ if test "x$enable_javascript" = "xyes" ; then AC_CHECK_HEADER(v8.h,ac_found_v8_header="yes",ac_found_v8_header="no") if test "x$ac_found_v8_header" = "xyes" ; then #AC_CHECK_LIB(v8,v8,ac_found_v8_lib="yes",ac_found_v8_lib="no") - ac_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -lv8" + ac_save_LIBS="$LIBS" + LIBS="$LIBS -lv8" AC_MSG_CHECKING(for v8 usability in programs) AC_TRY_RUN([ #include @@ -898,7 +898,7 @@ if test "x$enable_javascript" = "xyes" ; then const char *version = V8::GetVersion(); return 0; }],ac_found_v8_lib="yes", ac_found_v8_lib="no", ac_found_v8_lib="assume-yes") - LDFLAGS="$ac_save_LDFLAGS" + LIBS="$ac_save_LIBS" if test "x$ac_found_v8_lib" = "xyes" ; then AC_MSG_RESULT(yes) v8_found="yes" diff --git a/tests/unit/test-plugins.cpp b/tests/unit/test-plugins.cpp index 639d7e5e5..efe8749f2 100644 --- a/tests/unit/test-plugins.cpp +++ b/tests/unit/test-plugins.cpp @@ -60,7 +60,7 @@ TEST(Plugins, Loaded) CHECK(hdata_search (hdata, plugins, "${plugin.name} == fset", 1)); CHECK(hdata_search (hdata, plugins, "${plugin.name} == guile", 1)); CHECK(hdata_search (hdata, plugins, "${plugin.name} == irc", 1)); - //CHECK(hdata_search (hdata, plugins, "${plugin.name} == javascript", 1)); + CHECK(hdata_search (hdata, plugins, "${plugin.name} == javascript", 1)); CHECK(hdata_search (hdata, plugins, "${plugin.name} == logger", 1)); CHECK(hdata_search (hdata, plugins, "${plugin.name} == lua", 1)); CHECK(hdata_search (hdata, plugins, "${plugin.name} == perl", 1));