From: Karel Zak Date: Fri, 4 May 2012 09:45:35 +0000 (+0200) Subject: build-sys: add BUILD_WDCTL, check for linux/watchdog.h X-Git-Tag: v2.22-rc1~448 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b0289b9cfe7bfc1092a097a9aa8ea4f38d72431;p=thirdparty%2Futil-linux.git build-sys: add BUILD_WDCTL, check for linux/watchdog.h Signed-off-by: Karel Zak --- diff --git a/configure.ac b/configure.ac index 56f378ebbc..b5f3d57008 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,7 @@ AC_CHECK_HEADERS([ \ inttypes.h \ linux/cdrom.h \ linux/falloc.h \ + linux/watchdog.h \ linux/fd.h \ linux/raw.h \ linux/tiocl.h \ @@ -182,6 +183,7 @@ AC_CHECK_HEADERS([langinfo.h], dnl Convert some ac_cv_header_* variables to have_* dnl have_linux_raw_h=$ac_cv_header_linux_raw_h +have_linux_watchdog_h=$ac_cv_header_linux_watchdog_h have_security_pam_misc_h=$ac_cv_header_security_pam_misc_h @@ -919,6 +921,12 @@ UL_REQUIRES_HAVE([chcpu], [cpu_set_t], [cpu_set_t type]) AM_CONDITIONAL(BUILD_CHCPU, test "x$build_chcpu" = xyes) +UL_BUILD_INIT([wdctl], [check]) +UL_REQUIRES_LINUX([wdctl]) +UL_REQUIRES_HAVE([wdctl], [linux_watchdog_h], [linux/watchdog.h header file]) +AM_CONDITIONAL(BUILD_WDCTL, test "x$build_wdctl" = xyes) + + UL_BUILD_INIT([prlimit], [check]) UL_REQUIRES_LINUX([prlimit]) UL_REQUIRES_SYSCALL_CHECK([prlimit], [UL_CHECK_SYSCALL([prlimit64])], [prlimit64]) diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index caceae2c41..c19be4ceb2 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -185,6 +185,7 @@ ipcrm_SOURCES = ipcrm.c $(top_srcdir)/lib/strutils.c flock_SOURCES = flock.c $(top_srcdir)/lib/strutils.c ldattach_SOURCES = ldattach.c $(top_srcdir)/lib/strutils.c +if BUILD_WDCTL bin_PROGRAMS += wdctl dist_man_MANS += wdctl.8 wdctl_SOURCES = \ @@ -192,6 +193,7 @@ wdctl_SOURCES = \ $(top_srcdir)/lib/strutils.c \ $(top_srcdir)/lib/tt.c \ $(top_srcdir)/lib/mbsalign.c +endif if BUILD_MOUNTPOINT bin_PROGRAMS += mountpoint