|
From: <br...@us...> - 2009-11-01 08:20:08
|
Revision: 4036
http://openvrml.svn.sourceforge.net/openvrml/?rev=4036&view=rev
Author: braden
Date: 2009-11-01 08:19:57 +0000 (Sun, 01 Nov 2009)
Log Message:
-----------
Set JS_CFLAGS (if it has not been set) when building --with-libjs; ensure libjs was built with -DJS_THREADSAFE.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-10-31 10:05:52 UTC (rev 4035)
+++ trunk/ChangeLog 2009-11-01 08:19:57 UTC (rev 4036)
@@ -1,3 +1,9 @@
+2009-11-01 Braden McDaniel <br...@en...>
+
+ * configure.ac: Set JS_CFLAGS (if it has not been set) when
+ building --with-libjs; ensure libjs was built with
+ -DJS_THREADSAFE.
+
2009-10-31 Braden McDaniel <br...@en...>
* configure.ac: Require mozilla-js >= 1.8.1.8. This means we
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-10-31 10:05:52 UTC (rev 4035)
+++ trunk/configure.ac 2009-11-01 08:19:57 UTC (rev 4036)
@@ -154,8 +154,13 @@
have_libmozjs=yes
PKG_CHECK_MODULES([JS], [mozilla-js >= 1.8.1.8], , [have_libmozjs=no])
-AC_CHECK_LIB([js], [JS_Init], [have_libjs=yes], [have_libjs=no])
#
+# JS_BeginRequest should be there only if SpiderMonkey was built with
+# -DJS_THREADSAFE.
+#
+AC_CHECK_LIB([js], [JS_BeginRequest], [have_libjs=yes], [have_libjs=no])
+
+#
# Ensure that we can, in fact, find and use the SpiderMonkey headers.
#
ov_save_CPPFLAGS=$CPPFLAGS
@@ -311,12 +316,12 @@
[AC_HELP_STRING([--with-libjs],
[use libjs for JavaScript support])])
AS_IF([test X$enable_script_node_javascript = Xno],
-[JS_CFLAGS="" JS_LIBS=""],
-[AS_IF([test X$with_libjs = Xyes -a X$have_libjs = Xyes],
- [AS_IF([test -z "${JS_CFLAGS+x}"], [JS_CFLAGS=""])
- AS_IF([test -z "${JS_LIBS+x}"], [JS_LIBS="-ljs"])])
-AS_IF([test \( \( X$have_libmozjs = Xno -o \( X$with_libjs = Xyes -a X$have_libjs = Xno \) \) -a -z "${JS_LIBS+x}" \) -o X$have_jsapi_h != Xyes],
- [AC_MSG_FAILURE([SpiderMonkey is required for Script node JavaScript support])])])
+ [JS_CFLAGS="" JS_LIBS=""],
+ [AS_IF([test X$with_libjs = Xyes -a X$have_libjs = Xyes],
+ [AS_IF([test -z "${JS_CFLAGS+x}"], [JS_CFLAGS="-DXP_UNIX -DJS_THREADSAFE"])
+ AS_IF([test -z "${JS_LIBS+x}"], [JS_LIBS="-ljs"])])
+ AS_IF([test \( \( X$have_libmozjs = Xno -o \( X$with_libjs = Xyes -a X$have_libjs = Xno \) \) -a -z "${JS_LIBS+x}" \) -o X$have_jsapi_h != Xyes],
+ [AC_MSG_FAILURE([SpiderMonkey is required for Script node JavaScript support])])])
AC_SUBST([JS_CFLAGS])
AC_SUBST([JS_LIBS])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|