2004-06-22 Olivier Andrieu <oliv__a@users.sourceforge.net>

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

diff --git a/ChangeLog b/ChangeLog
index a6bb2d70c9bae91f2301bdd9dddef6bc6cbaf19f..cb441bdb1ff3fd89e5b94ce15a997267f87e499e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-22  Olivier Andrieu  <oliv__a@users.sourceforge.net>
+
+       * configure.in: prevent building the gcj stuff and libxml loader
+       since they are broken.
+
 2004-06-20  Havoc Pennington  <hp@redhat.com>
 
         * dbus/dbus-glib-error-enum.h: autogenerate the GError enum 

diff --git a/configure.in b/configure.in
index a43e11c2ff76b8581d048cd1e648f0fafca4ed9e..cfab621fa153953b3bd58d05c72052f24e4abe6e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -166,13 +166,14 @@ else
      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 @@ else
         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)