From 0dace18fa050de14809a8df55931e26a0bfba875 Mon Sep 17 00:00:00 2001 From: octo Date: Mon, 12 Dec 2005 18:29:28 +0000 Subject: [PATCH] Commented the configure and Makefile rules for the quota module --- configure.in | 43 +++++++++++++++++++++---------------------- src/Makefile.am | 20 ++++++++++---------- 2 files changed, 31 insertions(+), 32 deletions(-) diff --git a/configure.in b/configure.in index 4d8023e6..99895a5f 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(collectd, 3.5.alpha1-quota) +AC_INIT(collectd, 3.5.alpha2) AC_CONFIG_SRCDIR(src/collectd.c) AC_CONFIG_HEADERS(src/config.h) AM_INIT_AUTOMAKE(dist-bzip2) @@ -400,26 +400,6 @@ then fi AM_CONDITIONAL(BUILD_MODULE_DISK, test "x$enable_disk" = "xyes") -AC_ARG_ENABLE(quota, AC_HELP_STRING([--enable-quota], - [Enable quota statistics (experimental, disabled by default)]), - [], [enable_quota="no"]) -if test "x$enable_quota" = "xno" -then - collect_quota=0 -else - if test "x$enable_quota" = "xyes" - then - collect_quota=1 - else - AC_MSG_NOTICE([Please specify either --enable-quota or --disable-quota; Enabling quota statistics.]) - collect_quota=1 - enable_quota="yes" - fi -fi -AC_DEFINE_UNQUOTED(COLLECT_QUOTA, [$collect_quota], - [Wether or not to collect quota statistics]) -AM_CONDITIONAL(BUILD_MODULE_QUOTA, test "x$enable_quota" = "xyes") - AC_ARG_ENABLE(hddtemp, AC_HELP_STRING([--disable-hddtemp], [Disable hdd temperature statistics]),, [enable_hddtemp="yes"]) if test "x$enable_hddtemp" = "xno" then @@ -502,6 +482,26 @@ then fi AM_CONDITIONAL(BUILD_MODULE_PROCESSES, test "x$enable_processes" = "xyes") +#AC_ARG_ENABLE(quota, AC_HELP_STRING([--enable-quota], +# [Enable quota statistics (experimental, disabled by default)]), +# [], [enable_quota="no"]) +#if test "x$enable_quota" = "xno" +#then +# collect_quota=0 +#else +# if test "x$enable_quota" = "xyes" +# then +# collect_quota=1 +# else +# AC_MSG_NOTICE([Please specify either --enable-quota or --disable-quota; Enabling quota statistics.]) +# collect_quota=1 +# enable_quota="yes" +# fi +#fi +#AC_DEFINE_UNQUOTED(COLLECT_QUOTA, [$collect_quota], +# [Wether or not to collect quota statistics]) +#AM_CONDITIONAL(BUILD_MODULE_QUOTA, test "x$enable_quota" = "xyes") + AC_ARG_ENABLE(sensors, AC_HELP_STRING([--disable-sensors], [Disable lm_sensors statistics]),, [enable_sensors=$with_lm_sensors]) if test "x$enable_sensors" != "xno" then @@ -617,7 +617,6 @@ Configuration: cpu . . . . . . . . $enable_cpu cpufreq . . . . . . $enable_cpufreq disk . . . . . . . $enable_disk - quota . . . . . . . $enable_quota (experimental) hddtemp . . . . . . $enable_hddtemp load . . . . . . . $enable_load memory . . . . . . $enable_memory diff --git a/src/Makefile.am b/src/Makefile.am index fe1076b7..4f271bf2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,16 +46,16 @@ collectd_LDADD += "-dlopen" disk.la collectd_DEPENDENCIES += disk.la endif -if BUILD_MODULE_QUOTA -pkglib_LTLIBRARIES += quota.la -quota_la_SOURCES = quota_plugin.c quota_plugin.h -quota_la_SOURCES += quota_fs.c quota_fs.h -quota_la_SOURCES += quota_mnt.c quota_mnt.h -quota_la_LDFLAGS = -module -avoid-version -quota_la_CFLAGS = -Werror -collectd_LDADD += "-dlopen" quota.la -collectd_DEPENDENCIES += quota.la -endif +#if BUILD_MODULE_QUOTA +#pkglib_LTLIBRARIES += quota.la +#quota_la_SOURCES = quota_plugin.c quota_plugin.h +#quota_la_SOURCES += quota_fs.c quota_fs.h +#quota_la_SOURCES += quota_mnt.c quota_mnt.h +#quota_la_LDFLAGS = -module -avoid-version +#quota_la_CFLAGS = -Werror +#collectd_LDADD += "-dlopen" quota.la +#collectd_DEPENDENCIES += quota.la +#endif if BUILD_MODULE_HDDTEMP pkglib_LTLIBRARIES += hddtemp.la -- 2.11.0