[Lunar-commits] <moonbase> firefox: A couple of more adjustments. The if/then for dbus in the BUILDs

[Dennis `stumbles` Veatch]

commit 5b45bc2d9ce55aa221de0ddb0e5890177566203e
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Tue Jul 27 17:59:24 2010 -0400

    firefox: A couple of more adjustments. The if/then for dbus in the BUILDs
    
    does no good if there is not dbus in the DEPENDS, it will always be false.
    Looking through the compile log, it looks for dbus-glib anyway. Also in the
    mozconfig, I don't think we need to reserve memory for os/2.
---
 web/firefox/BUILD        |    6 ------
 web/firefox/BUILD.x86_64 |    6 ------
 web/firefox/DEPENDS      |    5 +++++
 web/firefox/mozconfig    |    1 +
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/web/firefox/BUILD b/web/firefox/BUILD
index 39b0c90..5456c31 100644
--- a/web/firefox/BUILD
+++ b/web/firefox/BUILD
@@ -29,12 +29,6 @@
 
   #Add DEPENDS options
 
-  if in_depends $MODULE dbus ; then
-    echo "ac_add_options --enable-dbus" >> mozconfig
-  else
-    echo "ac_add_options --disable-dbus" >> mozconfig
-  fi  &&
-
   if in_depends $MODULE "xulrunner" ; then
     XUL=`module_version xulrunner`
     echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
diff --git a/web/firefox/BUILD.x86_64 b/web/firefox/BUILD.x86_64
index 39b0c90..5456c31 100644
--- a/web/firefox/BUILD.x86_64
+++ b/web/firefox/BUILD.x86_64
@@ -29,12 +29,6 @@
 
   #Add DEPENDS options
 
-  if in_depends $MODULE dbus ; then
-    echo "ac_add_options --enable-dbus" >> mozconfig
-  else
-    echo "ac_add_options --disable-dbus" >> mozconfig
-  fi  &&
-
   if in_depends $MODULE "xulrunner" ; then
     XUL=`module_version xulrunner`
     echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-$XUL" >> mozconfig
diff --git a/web/firefox/DEPENDS b/web/firefox/DEPENDS
index f888b6f..479203a 100644
--- a/web/firefox/DEPENDS
+++ b/web/firefox/DEPENDS
@@ -21,3 +21,8 @@ optional_depends "gnome-vfs"  ""  ""  \
 
 optional_depends "Python"  ""  "" \
                  "Needed to do a Profile Guided Optimization build"
+
+optional_depends "dbus-glib" "--enable-dbus" "--disable-dbus" "for dbus support"
+
+
+
diff --git a/web/firefox/mozconfig b/web/firefox/mozconfig
index 71dbdb5..409bc24 100644
--- a/web/firefox/mozconfig
+++ b/web/firefox/mozconfig
@@ -27,3 +27,4 @@ ac_add_options --disable-pedantic
 ac_add_options --disable-logging
 ac_add_options --disable-accessibility
 ac_add_options --enable-mathml
+ac_add_options --disable-os2-high-mem