From 0da7295fbc34170385d2b6bd165685aa092ab0ec Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 10 Dec 2014 12:23:04 +0000 Subject: [PATCH] lib/texpect: prefer bsd/libutil.h if available MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Thu Dec 18 16:31:48 CET 2014 on sn-devel-104 --- lib/texpect/texpect.c | 4 +++- lib/texpect/wscript | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c index d78808188bb..75a32f4bed2 100644 --- a/lib/texpect/texpect.c +++ b/lib/texpect/texpect.c @@ -41,7 +41,9 @@ #ifdef HAVE_UTIL_H #include #endif -#ifdef HAVE_LIBUTIL_H +#ifdef HAVE_BSD_LIBUTIL_H +#include +#elif defined HAVE_LIBUTIL_H #include #endif diff --git a/lib/texpect/wscript b/lib/texpect/wscript index 4163ca10bd6..62a1d4dbb94 100644 --- a/lib/texpect/wscript +++ b/lib/texpect/wscript @@ -1,7 +1,7 @@ #!/usr/bin/env python def configure(conf): - conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h libutil.h') + conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h bsd/libutil.h libutil.h') def build(bld): bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util', install=False) -- 2.34.1