--- ./dbus/dbus-arch-deps.h.in.ORIG	2005-01-28 05:06:55.000000000 +0200
+++ ./dbus/dbus-arch-deps.h.in	2005-08-15 21:34:01.000000000 +0300
@@ -29,7 +29,7 @@
 
 #include <dbus/dbus-macros.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 #if @DBUS_HAVE_INT64@
 #define DBUS_HAVE_INT64 1
@@ -51,6 +51,6 @@
 typedef @DBUS_INT16_TYPE@ dbus_int16_t;
 typedef unsigned @DBUS_INT16_TYPE@ dbus_uint16_t;
 
-DBUS_END_DECLS;
+DBUS_END_DECLS
 
 #endif /* DBUS_ARCH_DEPS_H */
--- ./configure.in.ORIG	2005-06-15 21:15:27.000000000 +0300
+++ ./configure.in	2005-08-15 22:22:08.000000000 +0300
@@ -1,13 +1,19 @@
 dnl -*- mode: m4 -*-
 AC_PREREQ(2.52)
 
-AC_INIT(dbus/dbus.h)
+dnl obsolete macro:
+dnlAC_INIT(dbus/dbus.h)
+AC_INIT
+AC_CONFIG_SRCDIR([dbus/dbus.h])
+
+AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE(dbus, 0.34)
 
 AM_CONFIG_HEADER(config.h)
 
-AC_CANONICAL_TARGET
+dnl it should be before AM_INIT_AUTOMAKE(...)
+dnlAC_CANONICAL_TARGET
 
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -857,8 +863,8 @@
 AC_SUBST(DBUS_TEST_LIBS)
 
 # Glib detection
-PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0, have_glib=yes, have_glib=no)
-PKG_CHECK_MODULES(DBUS_GLIB_THREADS, glib-2.0 gthread-2.0, have_glib_threads=yes, have_glib_threads=no)
+PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0 >= 2.4, have_glib=yes, have_glib=no)
+PKG_CHECK_MODULES(DBUS_GLIB_THREADS, gthread-2.0 >= 2.4, have_glib_threads=yes, have_glib_threads=no)
 
 if test x$have_glib = xno ; then
     AC_MSG_WARN([GLib development libraries not found])