gdiff -u a/lib/texpect/texpect.c b/lib/texpect/texpect.c
--- a/lib/texpect/texpect.c	Wed Oct  1 05:17:32 2014
+++ b/lib/texpect/texpect.c	Mon Feb  9 21:31:19 2015
@@ -61,7 +61,14 @@
 
 #include <popt.h>
 #include <errno.h>
+#ifdef HAVE_ERR_H
 #include <err.h>
+#else
+#include <ccan/err/err.h>
+#endif
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
 
 struct command {
 	enum { CMD_EXPECT = 0, CMD_SEND, CMD_PASSWORD } type;

gdiff -u a/lib/texpect/wscript b/lib/texpect/wscript
--- a/lib/texpect/wscript	Wed Oct 15 03:51:19 2014
+++ b/lib/texpect/wscript	Mon Feb  9 22:38:01 2015
@@ -4,4 +4,4 @@
     conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.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)