[svn] commit: r1591 - in /branches/bind10-devel-20100319: Makefile.am configure.ac src/bin/bindctl/Makefile.am src/bin/cmdctl/Makefile.am

[BIND 10 source code commits]

Author: jreed
Date: Fri Mar 19 14:40:02 2010
New Revision: 1591

Log:
merge 1590 from trunk: --disable-install-configurations

Modified:
    branches/bind10-devel-20100319/Makefile.am
    branches/bind10-devel-20100319/configure.ac
    branches/bind10-devel-20100319/src/bin/bindctl/Makefile.am
    branches/bind10-devel-20100319/src/bin/cmdctl/Makefile.am

Modified: branches/bind10-devel-20100319/Makefile.am
==============================================================================
--- branches/bind10-devel-20100319/Makefile.am (original)
+++ branches/bind10-devel-20100319/Makefile.am Fri Mar 19 14:40:02 2010
@@ -4,7 +4,7 @@
 GENHTML=@GENHTML@
 
 # When running distcheck target, do not install the configurations
-DISTCHECK_CONFIGURE_FLAGS = --disable-configuration-install
+DISTCHECK_CONFIGURE_FLAGS = --disable-install-configurations
 
 clean-coverage:
 	@if [ $(USE_LCOV) = yes ] ; then \

Modified: branches/bind10-devel-20100319/configure.ac
==============================================================================
--- branches/bind10-devel-20100319/configure.ac (original)
+++ branches/bind10-devel-20100319/configure.ac Fri Mar 19 14:40:02 2010
@@ -256,11 +256,11 @@
 
 AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
 
-AC_ARG_ENABLE(configuration-install,
-  [AC_HELP_STRING([--enable-configuration-install],
-  [install configuration [default=yes]])], enable_configuration_install=$enableval, enable_configuration_install=no)
-
-AM_CONDITIONAL(ENABLE_CONFIGURATION_INSTALL, test x$enable_configuration_install != xno)
+AC_ARG_ENABLE(install-configurations,
+  [AC_HELP_STRING([--disable-install-configurations],
+  [do not install configuration])], install_configurations=$enableval, install_configurations=yes)
+
+AM_CONDITIONAL(INSTALL_CONFIGURATIONS, test x$install_configurations = xyes || test x$install_configurations = xtrue)
 
 AC_CONFIG_FILES([Makefile
                  src/Makefile

Modified: branches/bind10-devel-20100319/src/bin/bindctl/Makefile.am
==============================================================================
--- branches/bind10-devel-20100319/src/bin/bindctl/Makefile.am (original)
+++ branches/bind10-devel-20100319/src/bin/bindctl/Makefile.am Fri Mar 19 14:40:02 2010
@@ -25,7 +25,7 @@
 	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bindctl-source.py >$@
 	chmod a+x $@
 
-if ENABLE_CONFIGURATION_INSTALL
+if INSTALL_CONFIGURATIONS
 
 # TODO: permissions handled later
 install-data-local:

Modified: branches/bind10-devel-20100319/src/bin/cmdctl/Makefile.am
==============================================================================
--- branches/bind10-devel-20100319/src/bin/cmdctl/Makefile.am (original)
+++ branches/bind10-devel-20100319/src/bin/cmdctl/Makefile.am Fri Mar 19 14:40:02 2010
@@ -35,7 +35,7 @@
 	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" cmdctl.py >$@
 	chmod a+x $@
 
-if ENABLE_CONFIGURATION_INSTALL
+if INSTALL_CONFIGURATIONS
 
 # TODO: permissions handled later
 install-data-local: