Menu
▾
▴
SF.net SVN: openvrml:[3928] trunk
|
From: <br...@us...> - 2009-06-23 03:40:40
|
Revision: 3928
http://openvrml.svn.sourceforge.net/openvrml/?rev=3928&view=rev
Author: braden
Date: 2009-06-23 03:40:35 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
Check to see whether the pertinent precious variables have been set by the user before failing due to a missing dependency.
Modified Paths:
--------------
trunk/ChangeLog
trunk/configure.ac
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-06-23 03:32:50 UTC (rev 3927)
+++ trunk/ChangeLog 2009-06-23 03:40:35 UTC (rev 3928)
@@ -1,5 +1,11 @@
2009-06-22 Braden McDaniel <br...@en...>
+ * configure.ac: Check to see whether the pertinent precious
+ variables have been set by the user before failing due to a
+ missing dependency.
+
+2009-06-22 Braden McDaniel <br...@en...>
+
Use Spirit Classic in the boost::spirit::classic namespace.
* tests/parse_x3dvrml.cpp
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-06-23 03:32:50 UTC (rev 3927)
+++ trunk/configure.ac 2009-06-23 03:40:35 UTC (rev 3928)
@@ -132,7 +132,9 @@
#
# The XmlTextReader interface appears in libxml 2.5.
#
-PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.5])
+PKG_CHECK_MODULES([XML], [libxml-2.0 >= 2.5], , [have_libxml=no])
+AS_IF([test X$have_libxml = Xno -a -z "$XML_LIBS"],
+ [AC_MSG_FAILURE([libxml not found])])
PKG_CHECK_MODULES([FONTCONFIG], [$REQUIRE_FONTCONFIG], , [have_fontconfig=no])
PKG_CHECK_MODULES([FREETYPE], [$REQUIRE_FREETYPE], , [have_freetype=no])
@@ -314,15 +316,15 @@
AC_ARG_ENABLE([render-text-node],
[AC_HELP_STRING([--disable-render-text-node],
[disable support for rendering Text nodes])])
-if test X$enable_render_text_node != Xno; then
- if test X$have_fontconfig = Xno -o X$have_freetype = Xno; then
- AC_MSG_FAILURE([fontconfig and FreeType are required for rendering Text nodes.])
- fi
- AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1],
- [Defined if support for rendering Text nodes is enabled.])
- AC_DEFINE_UNQUOTED([OPENVRML_FT_CONST], [$ov_cv_ft_const],
- [const for FreeType callback function signatures.])
-fi
+AS_IF([test X$enable_render_text_node != Xno],
+ [AS_IF([test X$have_fontconfig = Xno -a -z "$FONTCONFIG_LIBS"],
+ [AC_MSG_FAILURE([fontconfig is required for rendering Text nodes])])
+ AS_IF([test X$have_freetype = Xno -a -z "$FREETYPE_LIBS"],
+ [AC_MSG_FAILURE([FreeType is required for rendering Text nodes])])
+ AC_DEFINE([OPENVRML_ENABLE_RENDER_TEXT_NODE], [1],
+ [Defined if support for rendering Text nodes is enabled.])
+ AC_DEFINE_UNQUOTED([OPENVRML_FT_CONST], [$ov_cv_ft_const],
+ [const for FreeType callback function signatures.])])
#
# Script node JavaScript support
@@ -334,13 +336,13 @@
AC_ARG_WITH([libjs],
[AC_HELP_STRING([--with-libjs],
[use libjs for JavaScript support])])
-AS_IF([test "X$enable_script_node_javascript" = "Xno"],
+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"], [JS_CFLAGS=""])
AS_IF([test -z "$JS_LIBS"], [JS_LIBS="-ljs"])])
-AS_IF([test X$have_libmozjs != Xyes -a \( X$with_libjs = Xyes -a X$have_libjs != Xyes \) -o X$have_jsapi_h != Xyes],
- [AC_MSG_FAILURE([SpiderMonkey is required for Script node JavaScript support.])])
+AS_IF([test \( \( X$have_libmozjs = Xno -o \( X$with_libjs = Xyes -a X$have_libjs = Xno \) \) -a -z "$JS_LIBS" \) -o X$have_jsapi_h != Xyes],
+ [AC_MSG_FAILURE([SpiderMonkey is required for Script node JavaScript support])])
AC_DEFINE([OPENVRML_ENABLE_SCRIPT_NODE_JAVASCRIPT], [1],
[Defined if Script node JavaScript support is enabled.])
#
@@ -424,9 +426,9 @@
[AC_HELP_STRING([--disable-xembed],
[do not build the XEmbed control])])
AS_IF([test X$enable_xembed != Xno],
- [AS_IF([test X$have_dbus_glib = Xno],
+ [AS_IF([test X$have_dbus_glib = Xno -a -z "$DBUS_G_LIBS"],
[AC_MSG_FAILURE([D-Bus GLib bindings are required to build the XEmbed control])])
- AS_IF([test X$have_gtkgl = Xno],
+ AS_IF([test X$have_gtkgl = Xno -a -z "$GTKGL_LIBS"],
[AC_MSG_FAILURE([GtkGLExt is required to build the XEmbed control])])
AS_IF([test X$enable_gl_renderer = Xno],
[AC_MSG_FAILURE([the XEmbed control cannot be built without the GL renderer])])])
@@ -441,11 +443,11 @@
AS_IF([test X$enable_player != Xno],
[AS_IF([test X$enable_xembed = Xno],
[AC_MSG_FAILURE([OpenVRML Player cannot be built without the XEmbed control])])
- AS_IF([test X$have_gio = Xno],
+ AS_IF([test X$have_gio = Xno -a -z "$GIO_LIBS"],
[AC_MSG_FAILURE([GIO is required to build OpenVRML Player])])
- AS_IF([test X$have_gnomeui = Xno],
+ AS_IF([test X$have_gnomeui = Xno -a -z "$GNOMEUI_LIBS"],
[AC_MSG_FAILURE([libgnomeui is required to build OpenVRML Player])])
- AS_IF([test X$have_libcurl = Xno],
+ AS_IF([test X$have_libcurl = Xno -a -z "$CURL_LIBS"],
[AC_MSG_FAILURE([libcurl is required to build OpenVRML Player])])
])
AM_CONDITIONAL([ENABLE_PLAYER], [test X$enable_player != Xno])
@@ -459,9 +461,9 @@
AS_IF([test X$enable_mozilla_plugin != Xno],
[AS_IF([test X$enable_xembed = Xno],
[AC_MSG_FAILURE([the Mozilla plug-in cannot be built without the XEmbed control])])
- AS_IF([test X$have_mozilla_plugin = Xno],
+ AS_IF([test X$have_mozilla_plugin = Xno -a -z "$MOZILLA_PLUGIN_CFLAGS"],
[AC_MSG_FAILURE([Mozilla plug-in development headers are required to build the Mozilla plug-in.])])
- AS_IF([test "X$have_dbus_glib" = "Xno"],
+ AS_IF([test X$have_dbus_glib = Xno -a -z "$DBUS_G_LIBS"],
[AC_MSG_FAILURE([The D-Bus GLib binding is required to build the Mozilla plug-in])])])
AM_CONDITIONAL([ENABLE_MOZILLA_PLUGIN],
[test "X$enable_mozilla_plugin" != "Xno" -a "X$have_dbus_glib" != "Xno"])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
