[Rt-commit] r4903 - rt/branches/3.7-EXPERIMENTAL

[ruz at bestpractical.com]

Author: ruz
Date: Thu Mar 30 01:34:39 2006
New Revision: 4903

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/Makefile.in
   rt/branches/3.7-EXPERIMENTAL/configure.ac

Log:
 r2278 at cubic-pc:  cubic | 2006-03-30 10:42:28 +0400
 * add --with-web-handler option to configure script
 * pass this option to rt-test-dependencies script


Modified: rt/branches/3.7-EXPERIMENTAL/Makefile.in
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/Makefile.in	(original)
+++ rt/branches/3.7-EXPERIMENTAL/Makefile.in	Thu Mar 30 01:34:39 2006
@@ -150,6 +150,12 @@
 
 # }}}
 
+# {{{ Web frontend
+
+WEB_HANDLER		=	@WEB_HANDLER@
+
+# }}}
+
 # {{{ Database setup
 
 #
@@ -254,12 +260,12 @@
 
 # {{{ dependencies
 testdeps:
-	$(PERL) ./sbin/rt-test-dependencies --verbose --with-$(DB_TYPE)
+	$(PERL) ./sbin/rt-test-dependencies --verbose --with-$(DB_TYPE) --with-$(WEB_HANDLER)
 
 depends: fixdeps
 
 fixdeps:
-	$(PERL) ./sbin/rt-test-dependencies --verbose --install --with-$(DB_TYPE)
+	$(PERL) ./sbin/rt-test-dependencies --verbose --install --with-$(DB_TYPE) --with-$(WEB_HANDLER)
 
 #}}}
 
@@ -350,7 +356,7 @@
 regression: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms apachectl run-regression
 
 run-regression:
-	prove -Ilib lib/t/setup_regression.t  lib/t/autogen/ lib/t/regression/
+	prove -I$(LOCAL_LIB_PATH) -Ilib lib/t/setup_regression.t  lib/t/autogen/ lib/t/regression/
 
 
 regression-noapache: regression-install dirs files-install libs-install sbin-install bin-install regression-instruct regression-reset-db  testify-pods fixperms start-httpd  run-regression

Modified: rt/branches/3.7-EXPERIMENTAL/configure.ac
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/configure.ac	(original)
+++ rt/branches/3.7-EXPERIMENTAL/configure.ac	Thu Mar 30 01:34:39 2006
@@ -31,15 +31,28 @@
 fi
 
 
+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])
+fi
+AC_SUBST(WEB_HANDLER)
+
 dnl SPEED_BIN
 AC_ARG_WITH(speedycgi,
 	    AC_HELP_STRING([--with-speedycgi=/path/to/speedy],
 	    		   [path to your speedycgi binary, if it exists]),
             SPEEDY_BIN=$withval,
             SPEEDY_BIN=/usr/local/bin/speedy) 
+if test "$WEB_HANDLER" = 'speedycgi' -a "$SPEEDY_BIN" = 'not found'; then
+	AC_MSG_ERROR([cannot find speedycgi binary])
+fi
 AC_SUBST(SPEEDY_BIN)
 
-
 dnl Defaults paths for installation
 AC_PREFIX_DEFAULT([/opt/rt3])
 RT_ENABLE_LAYOUT