Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 mail/dspam/CONFIGURE |   10 ++--------
 mail/dspam/DEPENDS   |    8 ++++++++
 mail/dspam/HISTORY   |    4 ++++
 3 files changed, 14 insertions(+), 8 deletions(-)

New commits:
commit d99f92999da89261f99194386f4b312dfa2c1d58
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    dspam: fixed virtual users option

diff --git a/mail/dspam/CONFIGURE b/mail/dspam/CONFIGURE
index 14e1142..88bc89c 100755
--- a/mail/dspam/CONFIGURE
+++ b/mail/dspam/CONFIGURE
@@ -1,12 +1,7 @@
 config_query DSPAM_GD     'Use gd for pretty graphs?' n  &&
 
-if is_depends_enabled $SPELL postgresql ||
-   is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL)
-then
-  config_query_option DSPAM_OPTS 'Enable virtual users?' n \
-               '--enable-virtual-users' '--disable-virtual-users'
-fi  &&
-
+config_query_option DSPAM_OPTS 'Enable debug mode?' n \
+             '--enable-debug' '--disable-debug' &&
 config_query_option DSPAM_OPTS 'Enable daemon mode?' y \
              '--enable-daemon' '--disable-daemon' &&
 config_query_option DSPAM_OPTS 'Enable preferences extension?' y \
@@ -19,4 +14,3 @@ config_query_list DSPAM_SCALE 'Select a filesystem 
organization method:'\
              'None'         \
              'Domain Scale' \
              'Large Scale'
-
diff --git a/mail/dspam/DEPENDS b/mail/dspam/DEPENDS
index 3708050..acaa865 100755
--- a/mail/dspam/DEPENDS
+++ b/mail/dspam/DEPENDS
@@ -14,6 +14,14 @@ optional_depends postgresql \
                  '--with-pgsql-includes=/usr/include/postgresql' \
                  '' \
                  'Enable PostgreSQL driver' &&
+
+if is_depends_enabled $SPELL postgresql ||
+   is_depends_enabled $SPELL $(get_spell_provider $SPELL MYSQL); then
+  config_query_option DSPAM_OPTS "Enable virtual users?" n \
+                                 "--enable-virtual-users" \
+                                 "--disable-virtual-users"
+fi &&
+
 if [[ "$DSPAM_GD"  == y ]]; then
   depends gd            &&
   sub_depends gd libpng &&
diff --git a/mail/dspam/HISTORY b/mail/dspam/HISTORY
index c02a0d8..07f5774 100644
--- a/mail/dspam/HISTORY
+++ b/mail/dspam/HISTORY
@@ -1,3 +1,7 @@
+2011-01-26 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFIGURE: virtual users option is never reached; added debug flags
+       * DEPENDS: moved virtual users selection here
+
 2011-01-20 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: PATCHLEVEL=1
        * BUILD: use correct db paths