[Rt-commit] r11070 - in rt/branches/3.8-TESTING: .

[ruz at bestpractical.com]

Author: ruz
Date: Fri Mar 14 13:36:14 2008
New Revision: 11070

Modified:
   rt/branches/3.8-TESTING/Makefile.in
   rt/branches/3.8-TESTING/configure.ac
   rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in

Log:
* make --with-web-handler a comma separated list

Modified: rt/branches/3.8-TESTING/Makefile.in
==============================================================================
--- rt/branches/3.8-TESTING/Makefile.in	(original)
+++ rt/branches/3.8-TESTING/Makefile.in	Fri Mar 14 13:36:14 2008
@@ -266,13 +266,15 @@
 
 
 # {{{ dependencies
+
+my_with_web_handlers= $(shell $(PERL) -e 'print join " ", map "--with-$$_", grep defined && length, split /,/, "$(WEB_HANDLER)"')
 testdeps:
-	$(PERL) ./sbin/rt-test-dependencies --verbose --with-$(DB_TYPE) --with-$(WEB_HANDLER)
+	$(PERL) ./sbin/rt-test-dependencies --verbose --with-$(DB_TYPE) $(my_with_web_handlers)
 
 depends: fixdeps
 
 fixdeps:
-	$(PERL) ./sbin/rt-test-dependencies --verbose --install --with-$(DB_TYPE) --with-$(WEB_HANDLER)
+	$(PERL) ./sbin/rt-test-dependencies --verbose --install --with-$(DB_TYPE) $(my_with_web_handlers)
 
 #}}}
 

Modified: rt/branches/3.8-TESTING/configure.ac
==============================================================================
--- rt/branches/3.8-TESTING/configure.ac	(original)
+++ rt/branches/3.8-TESTING/configure.ac	Fri Mar 14 13:36:14 2008
@@ -7,7 +7,7 @@
 
 dnl Setup autoconf
 AC_PREREQ(2.53)
-AC_INIT(RT, [3.7.81], [rt-bugs at bestpractical.com])
+AC_INIT(RT, 3.7.82, [rt-bugs at bestpractical.com])
 AC_CONFIG_SRCDIR([lib/RT.pm.in])
 
 dnl Extract RT version number components
@@ -33,12 +33,16 @@
 
 dnl WEB_HANDLER
 AC_ARG_WITH(web-handler,
-	    AC_HELP_STRING([--with-web-handler=TYPE],
-	    		   [web web-handler RT will use (default: modperl1) (modperl1, modperl2, fastcgi and speedycgi are valid)]),
-            WEB_HANDLER=$withval,
-            WEB_HANDLER=modperl1)
-if test "$WEB_HANDLER" != 'modperl1' -a "$WEB_HANDLER" != 'modperl2' -a "$WEB_HANDLER" != 'fastcgi' -a "$WEB_HANDLER" != 'speedycgi'; then
-	AC_MSG_ERROR([Only modperl1, modperl2, fastcgi and speedycgi are valid web-handlers])
+    AC_HELP_STRING([--with-web-handler=LIST],
+	[comma separated list of web-handlers RT will be able to use.
+         Default is fastcgi when modperl1, modperl2, fastcgi, standalone
+         and speedycgi are valid. To succefuly run RT you need only one.
+        ]),
+    WEB_HANDLER=$withval,
+    WEB_HANDLER=fastcgi)
+my_web_handler_test=$($PERL -e 'print "ok" unless grep $_ !~ /^(modperl[12]|fastcgi|speedycgi|standalone)$/i, grep defined && length, split /\s*,\s*/, "$WEB_HANDLER"')
+if test "$my_web_handler_test" != "ok"; then
+	AC_MSG_ERROR([Only modperl1, modperl2, fastcgi, speedycgi and standalone are valid web-handlers])
 fi
 AC_SUBST(WEB_HANDLER)
 
@@ -249,15 +253,6 @@
             APACHECTL=`which apachectl`)
 AC_SUBST(APACHECTL)
 
-dnl RT's standalone pure perl server
-AC_ARG_WITH(devel-mode,
-            AC_HELP_STRING([--with-standalone],
-                           [Install modules for pure perl standalone server]),
-
-            RT_STANDALONE="1",
-            RT_STANDALONE="0")
-AC_SUBST(RT_STANDALONE)
-
 dnl RT's "maintainer mode"
 AC_ARG_WITH(devel-mode,
             AC_HELP_STRING([--with-devel-mode],

Modified: rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in
==============================================================================
--- rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	(original)
+++ rt/branches/3.8-TESTING/sbin/rt-test-dependencies.in	Fri Mar 14 13:36:14 2008
@@ -81,7 +81,7 @@
     'with-CLI' => 1,
     'with-MAILGATE' => 1, 
     'with-DEV' => @RT_DEVEL_MODE@, 
-    'with-STANDALONE' => @RT_STANDALONE@,
+    'with-STANDALONE' => 0,
 );
 $args{$_} = $default{$_} foreach grep !exists $args{$_}, keys %default;