diff options
| author | Stefan Metzmacher <metze@samba.org> | 2014-12-10 12:23:04 +0000 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2014-12-18 16:31:48 +0100 |
| commit | 0da7295fbc34170385d2b6bd165685aa092ab0ec (patch) | |
| tree | fe728058dd74581f04b0915b4bd7cd34f42cb0c6 /lib/texpect | |
| parent | 349ba5188a93a3d4679de4908af8cef8cf0862cb (diff) | |
| download | samba-0da7295fbc34170385d2b6bd165685aa092ab0ec.tar.gz | |
lib/texpect: prefer bsd/libutil.h if available
Reviewed-by: Guenther Deschner <gd@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Thu Dec 18 16:31:48 CET 2014 on sn-devel-104
Diffstat (limited to 'lib/texpect')
| -rw-r--r-- | lib/texpect/texpect.c | 4 | ||||
| -rw-r--r-- | 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 <util.h> #endif -#ifdef HAVE_LIBUTIL_H +#ifdef HAVE_BSD_LIBUTIL_H +#include <bsd/libutil.h> +#elif defined HAVE_LIBUTIL_H #include <libutil.h> #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) |