aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>2015-03-02 13:25:06 -0300
committerVinícius dos Santos Oliveira <vini.ipsmaker@expertisesolutions.com.br>2015-06-02 14:12:03 -0300
commit2200d9b5baa05abd0fdca227f607e1ca2c26c313 (patch)
tree1e1b69be68e726e9e973f3f4763e8ba446a5554b
parenteolian-js: Fixed crashes in nodejs (diff)
downloadefl-2200d9b5baa05abd0fdca227f607e1ca2c26c313.tar.gz
fix build error when nodejs is built with --shared-libuv
-rw-r--r--configure.ac40
1 files changed, 34 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 6bd44c588f..5e691446d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1028,27 +1028,55 @@ case "$want_js" in
AC_CHECK_HEADER([node/v8.h],
[
AC_DEFINE_UNQUOTED([V8_INCLUDE_HEADER], [node/v8.h], [Include header for libv8])
- AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], [node/uv.h], [Include header for libuv])
AC_DEFINE_UNQUOTED([NODE_INCLUDE_HEADER], [node/node.h], [Include header for nodejs])
V8_INCLUDE_HEADER=node/v8.h
- UV_INCLUDE_HEADER=node/uv.h
NODE_INCLUDE_HEADER=node/node.h
AC_SUBST([V8_INCLUDE_HEADER])
- AC_SUBST([UV_INCLUDE_HEADER])
AC_SUBST([NODE_INCLUDE_HEADER])
+
+ AC_CHECK_HEADER([node/uv.h],
+ [
+ AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], [node/uv.h], [Include header for libuv])
+ UV_INCLUDE_HEADER=node/uv.h
+ AC_SUBST([UV_INCLUDE_HEADER])
+ ],
+ [
+ AC_CHECK_HEADER([uv.h],
+ [
+ AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], [uv.h], [Include header for libuv])
+ UV_INCLUDE_HEADER=uv.h
+ AC_SUBST([UV_INCLUDE_HEADER])
+ ],
+ [AC_MSG_ERROR([Could not find include headers from nodejs.])]
+ )
+ ])
],
[
AC_CHECK_HEADER([nodejs/deps/v8/v8.h],
[
AC_DEFINE_UNQUOTED([V8_INCLUDE_HEADER], [nodejs/deps/v8/v8.h], [Include header for libv8])
- AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], [nodejs/deps/uv/uv.h], [Include header for libuv])
AC_DEFINE_UNQUOTED([NODE_INCLUDE_HEADER], [nodejs/src/node.h], [Include header for nodejs])
V8_INCLUDE_HEADER=node/deps/v8/v8.h
- UV_INCLUDE_HEADER=node/deps/uv/uv.h
NODE_INCLUDE_HEADER=nodejs/src/node.h
AC_SUBST([V8_INCLUDE_HEADER])
- AC_SUBST([UV_INCLUDE_HEADER])
AC_SUBST([NODE_INCLUDE_HEADER])
+
+ AC_CHECK_HEADER([nodejs/deps/uv/uv.h],
+ [
+ AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], [nodejs/deps/uv/uv.h], [Include header for libuv])
+ UV_INCLUDE_HEADER=node/deps/uv/uv.h
+ AC_SUBST([UV_INCLUDE_HEADER])
+ ],
+ [
+ AC_CHECK_HEADER([uv.h],
+ [
+ AC_DEFINE_UNQUOTED([UV_INCLUDE_HEADER], [uv.h], [Include header for libuv])
+ UV_INCLUDE_HEADER=uv.h
+ AC_SUBST([UV_INCLUDE_HEADER])
+ ],
+ [AC_MSG_ERROR([Could not find include headers from nodejs.])]
+ )
+ ])
],
[AC_MSG_ERROR([Could not find include headers from nodejs.])]
)