From: Sebastian Harl <sh@tokkee.org>
Date: Mon, 4 Mar 2013 15:49:59 +0000 (+0100)
Subject: configure: Don't pre-set enable_<plugin> variables.
X-Git-Tag: sysdb-0.1.0~438^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c1c69d3ba6a8891e5c93b6cf6fcf32225a76636e;p=sysdb.git

configure: Don't pre-set enable_<plugin> variables.

This would cause AC_SDB_PLUGIN to assume that the respective --enable-<plugin>
option was given on the command-line and, thus, behave unexpected when this is
not the case.
---

diff --git a/configure.ac b/configure.ac
index fac681d..f765d5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,9 +223,9 @@ fi
 AC_SUBST([A2X])
 
 dnl Plugin checks.
-enable_puppet_storeconfigs=$with_libdbi
-if test "x$enable_puppet_storeconfigs" = "xno"; then
-	enable_puppet_storeconfigs="no (requires libdbi)"
+puppet_storeconfigs_default=$with_libdbi
+if test "x$puppet_storeconfigs_default" = "xno"; then
+	puppet_storeconfigs_default="no (requires libdbi)"
 fi
 
 m4_divert_once([HELP_ENABLE], [
@@ -236,7 +236,7 @@ AC_SDB_PLUGIN([collectd], [yes],
 		[backend accessing the system statistics collection daemon])
 AC_SDB_PLUGIN([mk-livestatus], [yes],
 		[backend accessing Nagios/Icinga/Shinken using MK Livestatus])
-AC_SDB_PLUGIN([puppet-storeconfigs], [$enable_puppet_storeconfigs],
+AC_SDB_PLUGIN([puppet-storeconfigs], [$puppet_storeconfigs_default],
 		[backend accessing the Puppet stored configuration database])
 
 AM_CONDITIONAL([BUILD_DOCUMENTATION], test "x$build_documentation" = "xyes")