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 <[email protected]> Reviewed-by: Jeremy Allison <[email protected]> Reviewed-by: Andreas Schneider <[email protected]> Autobuild-User(master): Andreas Schneider <[email protected]> Autobuild-Date(master): Tue Feb 17 18:09:52 CET 2015 on sn-devel-104
kenjiuno · Feb 17, 2015 · 4bbfc54 · 4bbfc54
1 parent 16a526b
commit 4bbfc54
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git 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
@@ -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)