]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
build-sys: add BUILD_WDCTL, check for linux/watchdog.h
authorKarel Zak <kzak@redhat.com>
Fri, 4 May 2012 09:45:35 +0000 (11:45 +0200)
committerKarel Zak <kzak@redhat.com>
Fri, 4 May 2012 09:45:35 +0000 (11:45 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
configure.ac
sys-utils/Makefile.am

index 56f378ebbcd4f8b32643ee6cc97f87cb0aedc204..b5f3d570087227b4f2f4bf60e7aa2515408e762c 100644 (file)
@@ -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])
index caceae2c419fed9a77752ec393c65d7c57f48bb6..c19be4ceb286378ebecf249a29fd8dd1df30b32e 100644 (file)
@@ -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