Code

configure: Don't pre-set enable_<plugin> variables.
authorSebastian Harl <sh@tokkee.org>
Mon, 4 Mar 2013 15:49:59 +0000 (16:49 +0100)
committerSebastian Harl <sh@tokkee.org>
Mon, 4 Mar 2013 15:49:59 +0000 (16:49 +0100)
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.

configure.ac

index fac681dc116fa66328ae29bf834d25cbf6e23486..f765d5f56f9efe9edb8bfbc9b1a721e3d8e5f558 100644 (file)
@@ -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")