NS_OSSO requires DBUS. bug 445943. r=ted
authorDoug Turner <dougt@meer.net>
Mon, 11 Aug 2008 17:22:48 -0700
changeset 16570 68b61804e8efbf08d1f77187906a5c12990ac1b3
parent 16569 bfed06cd8ad751db09d47176d17e160b8b30e9a8
child 16571 dfc43ed110cbf5a7c766af214e7c11ddb4a9dc3e
push idunknown
push userunknown
push dateunknown
reviewersted
bugs445943
milestone1.9.1a2pre
NS_OSSO requires DBUS. bug 445943. r=ted
configure.in
--- a/configure.in
+++ b/configure.in
@@ -1577,31 +1577,16 @@ dnl Get version of various core apps fro
 FIREFOX_VERSION=`cat $topsrcdir/browser/config/version.txt`
 THUNDERBIRD_VERSION=`cat $topsrcdir/mail/config/version.txt`
 SUNBIRD_VERSION=`cat $topsrcdir/calendar/sunbird/config/version.txt`
 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 ========================================================
 
 case "$target" in
 *-aix*)
     AC_DEFINE(AIX)
     if test ! "$GNU_CC"; then
@@ -6059,16 +6044,17 @@ then
     SQLITE_CFLAGS=
     SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
 else
     PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
 fi
 
 AC_SUBST(MOZ_NATIVE_SQLITE)
 
+dnl ========================================================
 dnl = Enable help viewer (off by default)
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(help-viewer,
 [  --enable-help-viewer        Enable help viewer],
     MOZ_HELP_VIEWER=1,
     MOZ_HELP_VIEWER= )
 if test -n "$MOZ_HELP_VIEWER"; then
      AC_DEFINE(MOZ_HELP_VIEWER)
@@ -6126,16 +6112,37 @@ MOZ_ARG_ENABLE_BOOL(js-ultrasparc,
 dnl only enable option for ultrasparcs
 if test `echo "$target_os" | grep -c \^solaris 2>/dev/null` = 0 -o \
     "$OS_TEST" != "sun4u"; then
     JS_ULTRASPARC_OPTS=
 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
 dnl =
 dnl ========================================================
 dnl MOZ_ARG_HEADER(Features that require extra sources)
 
 dnl ========================================================
 dnl =