Menu
▾
▴
[openvrml-commit] openvrml ChangeLog, 1.1521, 1.1522 configure.ac, 1.116, 1.117
|
From: Braden M. <br...@us...> - 2007-06-21 20:57:07
|
Update of /cvsroot/openvrml/openvrml In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13782 Modified Files: ChangeLog configure.ac Log Message: Added option --with-libjs to enable use of libjs built from the stand-alone SpiderMonkey distribution. Index: configure.ac =================================================================== RCS file: /cvsroot/openvrml/openvrml/configure.ac,v retrieving revision 1.116 retrieving revision 1.117 diff -C2 -d -r1.116 -r1.117 *** configure.ac 2 Jun 2007 06:47:04 -0000 1.116 --- configure.ac 21 Jun 2007 20:56:59 -0000 1.117 *************** *** 127,136 **** ]) ! PKG_CHECK_MODULES([JS], [$REQUIRE_FIREFOX_JS], [mozilla_js_pkg=$REQUIRE_FIREFOX_JS], [PKG_CHECK_MODULES([JS], [$REQUIRE_MOZILLA_JS], [mozilla_js_pkg=$REQUIRE_MOZILLA_JS], ! [have_js=no])]) # # openvrml-xembed and openvrml-player both use GOption, which was --- 127,138 ---- ]) ! have_libmozjs=yes PKG_CHECK_MODULES([JS], [$REQUIRE_FIREFOX_JS], [mozilla_js_pkg=$REQUIRE_FIREFOX_JS], [PKG_CHECK_MODULES([JS], [$REQUIRE_MOZILLA_JS], [mozilla_js_pkg=$REQUIRE_MOZILLA_JS], ! [have_libmozjs=no])]) ! AC_CHECK_LIB([js], [JS_Init], [have_libjs=yes], [have_libjs=no]) ! # # openvrml-xembed and openvrml-player both use GOption, which was *************** *** 239,260 **** [AC_HELP_STRING([--disable-script-node-javascript], [disable Script node JavaScript support])]) if test "X$enable_script_node_javascript" = "Xno"; then JS_CFLAGS="" JS_LIBS="" else ! if test "X$have_js" = "Xno"; then ! AC_MSG_FAILURE([Mozilla JavaScript is required for Script node JavaScript support.]) fi ! if test -n "${OPENVRML_PKG_REQUIRES}"; then ! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES}," fi ! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${mozilla_js_pkg}" ! AC_DEFINE([OPENVRML_ENABLE_SCRIPT_NODE_JAVASCRIPT], [1], [Defined if Script node JavaScript support is enabled.]) ! GRE_PATH=`$PKG_CONFIG --libs-only-L ${mozilla_js_pkg%% *} | sed -e 's/^-L//' -e 's/ *$//'` ! if test -n "${openvrml_run_path}" -a -n "${GRE_PATH}"; then ! openvrml_run_path=":${openvrml_run_path}" fi - openvrml_run_path="${GRE_PATH}${openvrml_run_path}" fi AC_SUBST([JS_CFLAGS]) --- 241,271 ---- [AC_HELP_STRING([--disable-script-node-javascript], [disable Script node JavaScript support])]) + AC_ARG_WITH([libjs], + [AC_HELP_STRING([--with-libjs], + [use libjs for JavaScript support])]) if test "X$enable_script_node_javascript" = "Xno"; then JS_CFLAGS="" JS_LIBS="" else ! if test X$with_libjs = Xyes; then ! JS_CFLAGS="" ! JS_LIBS="-ljs" fi ! if test X$have_libmozjs = Xno -a X$have_libjs = Xno; then ! AC_MSG_FAILURE([SpiderMonkey is required for Script node JavaScript support.]) fi ! if test X$with_libjs = Xno; then ! if test -n "${OPENVRML_PKG_REQUIRES}"; then ! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES}," ! fi ! OPENVRML_PKG_REQUIRES="${OPENVRML_PKG_REQUIRES} ${mozilla_js_pkg}" ! AC_DEFINE([OPENVRML_ENABLE_SCRIPT_NODE_JAVASCRIPT], [1], [Defined if Script node JavaScript support is enabled.]) ! GRE_PATH=`$PKG_CONFIG --libs-only-L ${mozilla_js_pkg%% *} | sed -e 's/^-L//' -e 's/ *$//'` ! if test -n "${openvrml_run_path}" -a -n "${GRE_PATH}"; then ! openvrml_run_path=":${openvrml_run_path}" ! fi ! openvrml_run_path="${GRE_PATH}${openvrml_run_path}" fi fi AC_SUBST([JS_CFLAGS]) Index: ChangeLog =================================================================== RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v retrieving revision 1.1521 retrieving revision 1.1522 diff -C2 -d -r1.1521 -r1.1522 *** ChangeLog 21 Jun 2007 20:53:17 -0000 1.1521 --- ChangeLog 21 Jun 2007 20:56:59 -0000 1.1522 *************** *** 1,4 **** --- 1,9 ---- 2007-06-21 Braden McDaniel <br...@en...> + * configure.ac: Added option --with-libjs to enable use of libjs + built from the stand-alone SpiderMonkey distribution. + + 2007-06-21 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/vrml97node.cpp: Wrap include of jpeglib.h in extern "C"; the MacPorts variant of the libjpeg |
