diff options
| author | Tom Schulz <schulz@adi.com> | 2015-02-13 13:47:14 -0800 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2015-02-17 18:09:52 +0100 |
| commit | 4bbfc54d09d813d1fb827de5855ce40e8eab1095 (patch) | |
| tree | 43ba7b045e2df734e39a6507d53952ed99cdb42e /lib | |
| parent | 16a526be4fa1ad2731abaec3906bc55099649269 (diff) | |
| download | samba-4bbfc54d09d813d1fb827de5855ce40e8eab1095.tar.gz samba-4bbfc54d09d813d1fb827de5855ce40e8eab1095.tar.xz samba-4bbfc54d09d813d1fb827de5855ce40e8eab1095.zip | |
lib: texpect. Fix the build on Solaris.
Bug 11092 - texpect requires routines err and errx
https://bugzilla.samba.org/show_bug.cgi?id=11092
Signed-off-by: Tom Schulz <schulz@adi.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Feb 17 18:09:52 CET 2015 on sn-devel-104
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/texpect/texpect.c | 5 | ||||
| -rw-r--r-- | lib/texpect/wscript | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c index 75a32f4bed..9256b5ee31 100644 --- a/lib/texpect/texpect.c +++ b/lib/texpect/texpect.c @@ -52,7 +52,12 @@ #endif /* STREAMPTY */ #include <popt.h> + +#ifdef HAVE_ERR_H #include <err.h> +#else +#include <ccan/err/err.h> +#endif struct command { enum { CMD_EXPECT = 0, CMD_SEND, CMD_PASSWORD } type; diff --git a/lib/texpect/wscript b/lib/texpect/wscript index 62a1d4dbb9..3dd4740a13 100644 --- a/lib/texpect/wscript +++ b/lib/texpect/wscript @@ -4,4 +4,4 @@ def configure(conf): 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) + bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util ccan', install=False) |