dbus configure.in,1.87,1.88 ChangeLog,1.525,1.526

[Olivier Andrieu]

Update of /cvs/dbus/dbus
In directory pdx:/tmp/cvs-serv9069

Modified Files:
	configure.in ChangeLog 
Log Message:
2004-06-22  Olivier Andrieu  <oliv__a at users.sourceforge.net>

	* configure.in: prevent building the gcj stuff and libxml loader
	since they are broken.


Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- configure.in	10 Jun 2004 12:10:13 -0000	1.87
+++ configure.in	22 Jun 2004 11:58:13 -0000	1.88
@@ -166,13 +166,14 @@
      AC_SUBST(GCJFLAGS)
 fi
 
-if test x$enable_gcj = xauto ; then
-    if test x$have_gcj = xno ; then
-        enable_gcj=no
-    else
-        enable_gcj=yes
-    fi
-fi
+dnl Commenting this out so that gcj stuff won't get built unless explicitly required
+# if test x$enable_gcj = xauto ; then
+#     if test x$have_gcj = xno ; then
+#         enable_gcj=no
+#     else
+#         enable_gcj=yes
+#     fi
+# fi
 
 if test x$enable_gcj = xyes; then
     if test x$have_gcj = xno ; then
@@ -672,6 +673,11 @@
         fi
 fi
 
+if $dbus_use_libxml ; then
+	dnl libxml loader is broken
+	AC_MSG_ERROR([libxml loader is broken ATM, use the expat loader])
+fi
+
 AM_CONDITIONAL(DBUS_USE_EXPAT, $dbus_use_expat)
 AM_CONDITIONAL(DBUS_USE_LIBXML, $dbus_use_libxml)
 

Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.525
retrieving revision 1.526
diff -u -d -r1.525 -r1.526
--- ChangeLog	20 Jun 2004 15:28:14 -0000	1.525
+++ ChangeLog	22 Jun 2004 11:58:13 -0000	1.526
@@ -1,3 +1,8 @@
+2004-06-22  Olivier Andrieu  <oliv__a at users.sourceforge.net>
+
+	* configure.in: prevent building the gcj stuff and libxml loader
+	since they are broken.
+
 2004-06-20  Havoc Pennington  <hp at redhat.com>
 
         * dbus/dbus-glib-error-enum.h: autogenerate the GError enum