From d8e7df768467c9ae545fb879f4c3833fac9b7ebd Mon Sep 17 00:00:00 2001
From: Doug Turner <dougt@meer.net>
Date: Mon, 11 Aug 2008 17:22:48 -0700
Subject: [PATCH] NS_OSSO requires DBUS. bug 445943. r=ted

---
 configure.in | 37 ++++++++++++++++++++++---------------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/configure.in b/configure.in
index 0d0f3466f481..2b63da52af86 100644
--- a/configure.in
+++ b/configure.in
@@ -1582,21 +1582,6 @@ SEAMONKEY_VERSION=`cat $topsrcdir/suite/config/version.txt`
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
 
-PKG_CHECK_MODULES(LIBHILONMIME,libhildonmime,
-                  NS_HILDON=1,
-                  NS_HILDON=)
-if test $NS_HILDON; then
-   AC_DEFINE(NS_HILDON)
-fi
-
-PKG_CHECK_MODULES(LIBOSSO,libosso,
-                  NS_OSSO=1,
-                  NS_OSSO=)
-
-if test $NS_OSSO; then
-   AC_DEFINE(NS_OSSO)     
-fi
-
 dnl ========================================================
 dnl System overrides of the defaults for target
 dnl ========================================================
@@ -6064,6 +6049,7 @@ fi
 
 AC_SUBST(MOZ_NATIVE_SQLITE)
 
+dnl ========================================================
 dnl = Enable help viewer (off by default)
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(help-viewer,
@@ -6130,6 +6116,27 @@ if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \
 fi
 AC_SUBST(JS_ULTRASPARC_OPTS)
 
+dnl ========================================================
+dnl = Hildon and OSSO checks
+dnl ========================================================
+PKG_CHECK_MODULES(LIBHILONMIME,libhildonmime,
+                  NS_HILDON=1,
+                  NS_HILDON=)
+if test $NS_HILDON; then
+   AC_DEFINE(NS_HILDON)
+fi
+
+PKG_CHECK_MODULES(LIBOSSO,libosso,
+                  NS_OSSO=1,
+                  NS_OSSO=)
+
+if test $NS_OSSO; then
+    if test -z "$MOZ_ENABLE_DBUS"; then
+        AC_MSG_ERROR([DBus is required when building for OSSO])
+    fi
+    AC_DEFINE(NS_OSSO)     
+fi
+
 dnl ========================================================
 dnl =
 dnl = Feature options that require extra sources to be pulled