[tor-commits] [flashproxy/master] disable initscripts by default since it ignores ${prefix} and causes `make distcheck` to fail

[infinity0 at torproject.org]

commit ce622cbf25a754dcac838f2af350b9c49ecf12b5
Author: Ximin Luo <infinity0 at gmx.com>
Date:   Sat Sep 14 16:55:52 2013 +0100

    disable initscripts by default since it ignores ${prefix} and causes `make distcheck` to fail
---
 facilitator/INSTALL      |    2 +-
 facilitator/configure.ac |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/facilitator/INSTALL b/facilitator/INSTALL
index b7e80a3..dc9e848 100644
--- a/facilitator/INSTALL
+++ b/facilitator/INSTALL
@@ -6,7 +6,7 @@ Install the dependencies.
 Configure and install.
 
 	$ ./autogen.sh # if running from git or ./configure doesn't otherwise exist
-	$ ./configure --localstatedir=/var/local && make
+	$ ./configure --localstatedir=/var/local --enable-initscripts && make
 	# make pre-install install post-install
 
 This installs facilitator.cgi, facilitator, facilitator-email-poller,
diff --git a/facilitator/configure.ac b/facilitator/configure.ac
index e6a100d..a212332 100644
--- a/facilitator/configure.ac
+++ b/facilitator/configure.ac
@@ -13,10 +13,11 @@ AC_CONFIG_FILES([Makefile
 AC_PROG_LN_S
 # check that we want to install initscripts. don't bother checking that they
 # are supported, since we might be doing a staged install on a different system.
+# disabled by default since it ignores ${prefix} so `make distcheck` would fail
 AC_ARG_ENABLE([initscripts],
-	[AS_HELP_STRING([--disable-initscripts],
-		[install and configure sysvinit-style initscripts (default yes)])],
-	[do_initscripts=], [do_initscripts=yes])
+	[AS_HELP_STRING([--enable-initscripts],
+		[install and configure sysvinit-style initscripts (default no)])],
+	[do_initscripts=yes], [do_initscripts=])
 AM_CONDITIONAL([DO_INITSCRIPTS], [test "x$do_initscripts" = xyes])
 
 AC_OUTPUT