diff options
| author | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2015-01-12 12:19:31 -0200 |
|---|---|---|
| committer | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2015-01-12 12:19:31 -0200 |
| commit | ecd24069cc4379666dc55b786ae8d78effa47acf (patch) | |
| tree | 17a6f3c66777a6c50eda1637a863b44404afd4ec | |
| parent | 1d4145c2733d383287a2ec95a5d4cc78ecfdc0d3 (diff) | |
| download | efl-ecd24069cc4379666dc55b786ae8d78effa47acf.tar.gz | |
Fixed HAVE_JS
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 5658b0417d..6f967583f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1009,13 +1009,16 @@ AC_DEFINE_IF([HAVE_NODEJS], [test "x${want_js}" = "xnodejs"], AC_SUBST([want_js]) AC_SUBST([HAVE_NODEJS]) +AM_CONDITIONAL([HAVE_JS], [test "x${want_js}" = "xnodejs" -o "x${want_js}" = "xlibv8" -o "x${want_js}" = "xlibuv"]) +AC_DEFINE([HAVE_JS], [test "x${want_js}" = "xnodejs" -o "x${want_js}" = "xlibv8" -o "x${want_js}" = "xlibuv"]) +AC_SUBST([HAVE_JS]) + #### Eina JS EFL_LIB_START([Eina_Js]) AC_LANG_PUSH([C++]) case "$want_js" in nodejs) - AM_CONDITIONAL([HAVE_JS], [1]) AC_CHECK_HEADER([node/v8.h], [ AC_DEFINE_UNQUOTED([V8_INCLUDE_HEADER], ["node/v8.h"], [Include header for libv8]) @@ -1024,22 +1027,16 @@ case "$want_js" in [AC_MSG_ERROR([Could not find include headers from nodejs.])]) ;; libv8) - AM_CONDITIONAL([HAVE_JS], [1]) EFL_DEPEND_PKG([EINA_JS], [V8], [v8 >= 3.25.28]) -# EFL_DEPEND_PKG([EO_JS], [V8], [v8 >= 3.25.28]) AC_DEFINE_UNQUOTED([V8_INCLUDE_HEADER], ["v8.h"], [Include header for libv8]) ;; libuv) - AM_CONDITIONAL([HAVE_JS], [1]) EFL_DEPEND_PKG([EINA_JS], [V8], [v8 >= 3.25.28]) EFL_DEPEND_PKG([EINA_JS], [UV], [v8 >= 1.1.0]) -# EFL_DEPEND_PKG([EO_JS], [V8], [v8 >= 3.25.28]) -# EFL_DEPEND_PKG([EO_JS], [UV], [v8 >= 1.1.0]) AC_DEFINE_UNQUOTED([V8_INCLUDE_HEADER], ["v8.h"], [Include header for libv8]) AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], ["uv.h"], [Include header for libuv]) ;; none) - AM_CONDITIONAL([HAVE_JS], [0]) ;; *) AC_MSG_ERROR([Invalid javascript dependency (${want_js}): must be none, nodejs, libv8 or libuv]) ;; esac |