Source Mage code commit list

[Arwed von Merkatz <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

 news/liferea/BUILD   |    2 +-
 news/liferea/DEPENDS |    2 +-
 news/liferea/HISTORY |    3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 4eaca5226d488a0df79389b7b6d8b5325a2b65f8
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    liferea: another fix so you can choose no GECKO provider while one or 
more are installed

diff --git a/news/liferea/BUILD b/news/liferea/BUILD
index c5a0064..93fcff6 100755
--- a/news/liferea/BUILD
+++ b/news/liferea/BUILD
@@ -4,7 +4,7 @@ elif test "$(get_spell_provider $SPELL G
   OPTS="$OPTS --enable-gecko=seamonkey --disable-xulrunner"
 elif test "$(get_spell_provider $SPELL GECKO)" = xulrunner; then
   OPTS="$OPTS --enable-xulrunner"
-else
+elif test "$(get_spell_provider $SPELL GECKO)" = mozilla; then
   OPTS="$OPTS --enable-gecko=mozilla --disable-xulrunner"
 fi  &&
 default_build
diff --git a/news/liferea/DEPENDS b/news/liferea/DEPENDS
index 732449d..f3de0d4 100755
--- a/news/liferea/DEPENDS
+++ b/news/liferea/DEPENDS
@@ -16,7 +16,7 @@ optional_depends  libnotify
                   "to build libnotify pluging"       &&
 optional_depends  GECKO                               \
                   ""                                  \
-                  "--disable-gecko"                   \
+                  "--disable-gecko --disable-xulrunner"  \
                   "for Mozilla (gecko) html display" &&
 optional_depends  lua                                 \
                   ""                                  \
diff --git a/news/liferea/HISTORY b/news/liferea/HISTORY
index f8706be..664e819 100644
--- a/news/liferea/HISTORY
+++ b/news/liferea/HISTORY
@@ -2,7 +2,8 @@
        * DEPENDS: removed harmful optional_depends on xulrunner that breaks
          if anything except xulrunner is chosen as GECKO provider
        * BUILD: add --disable-xulrunner switch if firefox, seamonkey or
-         mozilla are chosen as GECKO provider
+         mozilla are chosen as GECKO provider,
+         only explicitly enable mozilla if it's actually the GECKO provider
 
 2007-02-24 George Sherwood <george AT beernabeer.com>
        * DETAILS: Updated stable and devel to 1.2.7