[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (070f11bb476e9d2829ab40e563c30c037400ee34)

Vlad Glagolev scm at sourcemage.org
Tue Dec 13 12:20:33 EST 2011


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 http/seamonkey/CONFIGURE |   16 +++++++++++++---
 http/seamonkey/HISTORY   |    3 +++
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 070f11bb476e9d2829ab40e563c30c037400ee34
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    seamonkey: corrected configure options

diff --git a/http/seamonkey/CONFIGURE b/http/seamonkey/CONFIGURE
index 27361c7..238dfe4 100755
--- a/http/seamonkey/CONFIGURE
+++ b/http/seamonkey/CONFIGURE
@@ -16,9 +16,19 @@ if list_find "$SEAMONKEY_OPTS" "--disable-mailnews"; then
   list_add "SEAMONKEY_OPTS" "--enable-mailnews"
 fi &&
 
-config_query_option SEAMONKEY_OPTS "Build Composer component?" n \
-                                   "--enable-composer" \
-                                   "--disable-composer" &&
+if list_find "$SEAMONKEY_OPTS" "--enable-mailnews"; then
+  message "${MESSAGE_COLOR}"
+  message "SeaMonkey's mail & news component doesn't work when built without composer"
+  message "support at the moment. Forcing '--enable-composer' configure option."
+  message "${DEFAULT_COLOR}"
+
+  list_add "SEAMONKEY_OPTS" "--enable-composer" &&
+  list_remove "SEAMONKEY_OPTS" "--disable-composer"
+else
+  config_query_option SEAMONKEY_OPTS "Build Composer component?" y \
+                                     "--enable-composer" \
+                                     "--disable-composer"
+fi &&
 
 config_query_option SEAMONKEY_OPTS "Build Lightning calendar extension?" n \
                                    "--enable-calendar" \
diff --git a/http/seamonkey/HISTORY b/http/seamonkey/HISTORY
index 432f8ed..e08817a 100644
--- a/http/seamonkey/HISTORY
+++ b/http/seamonkey/HISTORY
@@ -1,3 +1,6 @@
+2011-12-13 Vlad Glagolev <stealth at sourcemage.org>
+	* CONFIGURE: continue handling of the legacy
+
 2011-12-11 Vlad Glagolev <stealth at sourcemage.org>
 	* BUILD: switched to MOZCONFIG var, corrected multijob build; added
 	  missing configure options (pthreads support)


More information about the SM-Commit mailing list