SF.net SVN: openvrml:[3728] trunk

[<br...@us...>]

Revision: 3728
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3728&view=rev
Author:   braden
Date:     2008-10-08 06:14:06 +0000 (Wed, 08 Oct 2008)

Log Message:
-----------
Fail if dbus-glib isn't found.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-10-08 01:00:06 UTC (rev 3727)
+++ trunk/ChangeLog	2008-10-08 06:14:06 UTC (rev 3728)
@@ -1,5 +1,9 @@
-2008-10-06 Braden McDaniel  <br...@en...>
+2008-10-08 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Fail if dbus-glib isn't found.
+
+2008-10-07 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Removed redundant AC_ARG_VAR for JAVA_HOME.
 
 2008-10-06 Braden McDaniel  <br...@en...>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-10-08 01:00:06 UTC (rev 3727)
+++ trunk/configure.ac	2008-10-08 06:14:06 UTC (rev 3728)
@@ -166,6 +166,7 @@
 #
 PKG_CHECK_MODULES([DBUS_G], [dbus-glib-1 glib-2.0 >= 2.6], ,
                   [have_dbus_glib=no])
+AC_ARG_VAR([DBUS_BINDING_TOOL], [Generate stub code for dbus-glib])
 AC_PATH_PROG([DBUS_BINDING_TOOL], [dbus-binding-tool])
 
 #
@@ -373,7 +374,9 @@
               [AC_HELP_STRING([--disable-xembed],
                               [do not build the XEmbed control])])
 AS_IF([test X$enable_xembed != Xno],
-      [AS_IF([test X$have_gtk = Xno],
+      [AS_IF([test X$have_dbus_glib = Xno],
+             [AC_MSG_FAILURE([D-Bus GLib bindings are required to build the XEmbed control])])
+       AS_IF([test X$have_gtk = Xno],
              [AC_MSG_FAILURE([GTK+ 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])])])


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.