From 601a4eae6906761b26bdb555b005d93090c17a04 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Fri, 26 Oct 2012 02:02:15 -0400 Subject: [PATCH] 1) Cleans up one configure.ac error AC_LINK_IFELSE requires AC_LANG_PROGRAM (or something similar) to get the setup right. 2) Fix for maintaier-clean so that you can run the autoreconf build script multiple times. 3) Clean up the generated man pages when running cleanup. Signed-off-by: Florian Forster --- Makefile.am | 7 ++++++- configure.in | 29 ++++++++++++++--------------- src/Makefile.am | 2 ++ 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9e3feac4..52671235 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I libltdl/m4 -SUBDIRS = libltdl src bindings +SUBDIRS = libltdl src bindings . INCLUDES = $(LTDLINCL) @@ -10,3 +10,8 @@ install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(localstatedir)/run $(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME) $(mkinstalldirs) $(DESTDIR)$(localstatedir)/log + +maintainer-clean-local: + -rm -f -r libltdl + -rm -f INSTALL + -rm -f aclocal.m4 diff --git a/configure.in b/configure.in index 39a99ead..b2b496ab 100644 --- a/configure.in +++ b/configure.in @@ -2153,21 +2153,20 @@ then #include #include ]) - AC_COMPILE_IFELSE( -[#include -#include -#include -#include -#include -#include - -int main (void) -{ - int retval = TCA_STATS2; - return (retval); -}], - [AC_DEFINE([HAVE_TCA_STATS2], 1, [True if the enum-member TCA_STATS2 exists])] - []); + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [ + #include + #include + #include + #include + #include + #include + ], [ + int retval = TCA_STATS2; + return (retval); + ] + )], + [AC_DEFINE([HAVE_TCA_STATS2], [1], [True if the enum-member TCA_STATS2 exists])]) AC_COMPILE_IFELSE( [#include diff --git a/src/Makefile.am b/src/Makefile.am index 59f1d257..40b8293d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1203,6 +1203,8 @@ collectd_LDADD += "-dlopen" zfs_arc.la collectd_DEPENDENCIES += zfs_arc.la endif +BUILT_SOURCES += $(dist_man_MANS) + dist_man_MANS = collectd.1 \ collectd.conf.5 \ collectd-email.5 \ -- 2.30.2