Author: sandervanderburg
Date: Mon Oct 11 20:24:31 2010
New Revision: 24226
URL: https://svn.nixos.org/websvn/nix/?rev=24226&sc=1
Log:
Fixed --with-tomcat option so that it can be enabled/disabled
Modified:
disnix/disnix-activation-scripts-nixos/trunk/configure.ac
Modified: disnix/disnix-activation-scripts-nixos/trunk/configure.ac
==============================================================================
--- disnix/disnix-activation-scripts-nixos/trunk/configure.ac Mon Oct 11
19:59:28 2010 (r24225)
+++ disnix/disnix-activation-scripts-nixos/trunk/configure.ac Mon Oct 11
20:24:31 2010 (r24226)
@@ -34,7 +34,7 @@
AS_IF([test "x$with_mysql" != "xno"],
[AC_PATH_PROG(mysql, mysql)])
-AS_IF([test "x$with_tomcat" != "x" || test "x$CATALINA_HOME" != "x"],
+AS_IF([test "x$with_tomcat" != "x" && test "x$with_tomcat" != "xno" || test
"x$CATALINA_HOME" != "x"],
[have_tomcat=yes],
[have_tomcat=no])
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
