[Rt-commit] rt branch, 4.4/external-storage, updated. rt-4.2.11-41-g7f3ffb0

[Shawn Moore]

The branch, 4.4/external-storage has been updated
       via  7f3ffb014d05f125163be0d806a1eb36cd5b8b03 (commit)
      from  c8b6bd021cddf2efe083523dc0971b446c80167c (commit)

Summary of changes:
 configure.ac                 | 10 ++++++++++
 sbin/rt-test-dependencies.in | 26 +++++++++++++-------------
 2 files changed, 23 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit 7f3ffb014d05f125163be0d806a1eb36cd5b8b03
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Fri May 22 19:24:23 2015 +0000

    Add --with-attachment-store to ./configure
    
        This sets up defaults for rt-test-dependencies

diff --git a/configure.ac b/configure.ac
index 7df7b37..1a611d3 100755
--- a/configure.ac
+++ b/configure.ac
@@ -324,6 +324,16 @@ fi
 AC_SUBST(RT_SMIME_DEPS)
 AC_SUBST(RT_SMIME)
 
+dnl ExternalStorage
+AC_ARG_WITH(attachment-store,
+	    AC_HELP_STRING([--with-attachment-store=TYPE],
+	    		   [which attachment storage RT will use for attachments (default: database) (database, disk, S3 and Dropbox are valid)]), 
+            ATTACHMENT_STORE=$withval,
+            ATTACHMENT_STORE=database)
+if test "$ATTACHMENT_STORE" != 'database' -a "$ATTACHMENT_STORE" != 'disk' -a "$ATTACHMENT_STORE" != 'S3' -a "$ATTACHMENT_STORE" != 'Dropbox' ; then
+	AC_MSG_ERROR([Only database, disk, S3 and Dropbox are valid db types])
+fi
+AC_SUBST(ATTACHMENT_STORE)
 
 dnl This section maps the variable names this script 'natively' generates
 dnl to their existing names. They should be removed from here as the .in
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index b2fcd89..70d9b29 100644
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -93,20 +93,20 @@ if ( $args{help} ) {
 
 # Set up defaults
 my %default = (
-    'with-CORE' => 1,
-    'with-CLI' => 1,
-    'with-MAILGATE' => 1, 
-    'with-DEVELOPER' => @RT_DEVELOPER@,
-    'with-GPG' => @RT_GPG_DEPS@,
-    'with-SMIME' => @RT_SMIME_DEPS@,
-    'with-ICAL' => 1,
-    'with-GRAPHVIZ' => @RT_GRAPHVIZ@,
-    'with-GD' => @RT_GD@,
+    'with-CORE'       => 1,
+    'with-CLI'        => 1,
+    'with-MAILGATE'   => 1, 
+    'with-DEVELOPER'  => @RT_DEVELOPER@,
+    'with-GPG'        => @RT_GPG_DEPS@,
+    'with-SMIME'      => @RT_SMIME_DEPS@,
+    'with-ICAL'       => 1,
+    'with-GRAPHVIZ'   => @RT_GRAPHVIZ@,
+    'with-GD'         => @RT_GD@,
     'with-DASHBOARDS' => 1,
-    'with-USERLOGO' => 1,
-    'with-HTML-DOC' => @RT_DEVELOPER@,
-    'with-S3' => 0,
-    'with-DROPBOX' => 0,
+    'with-USERLOGO'   => 1,
+    'with-HTML-DOC'   => @RT_DEVELOPER@,
+    'with-S3'         => (uc(q{@ATTACHMENT_STORE@}) eq 'S3'),
+    'with-DROPBOX'    => (uc(q{@ATTACHMENT_STORE@}) eq 'DROPBOX'),
 );
 $args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;
 

-----------------------------------------------------------------------