From 00a3f478135a84710769c2d69dc590918d3128dd Mon Sep 17 00:00:00 2001
From: Tom Schulz <schulz@adi.com>
Date: Fri, 13 Feb 2015 13:47:14 -0800
Subject: [PATCH] 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>
---
 lib/texpect/texpect.c | 5 +++++
 lib/texpect/wscript   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c
index 75a32f4..9256b5e 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 62a1d4d..3dd4740 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)
-- 
2.2.0.rc0.207.ga3a616c