4 files changed, 7 insertions, 3 deletions
diff --git a/source4/build/m4/rewrite.m4 b/source4/build/m4/rewrite.m4
index 275c001fdd..a29ae0ffa1 100644
--- a/source4/build/m4/rewrite.m4
+++ b/source4/build/m4/rewrite.m4
@@ -80,7 +80,7 @@ AC_DIRENT_D_OFF
 AC_CHECK_TYPE(ino_t,unsigned)
 AC_CHECK_TYPE(loff_t,off_t)
 AC_CHECK_TYPE(offset_t,loff_t)
-AC_CHECK_TYPE(ssize_t, int)
+AC_CHECK_TYPES(ssize_t)
 AC_CHECK_TYPES(intptr_t)
 
 
diff --git a/source4/heimdal_build/build_external.sh b/source4/heimdal_build/build_external.sh
index f95c43dc21..24e5eb9bee 100755
--- a/source4/heimdal_build/build_external.sh
+++ b/source4/heimdal_build/build_external.sh
@@ -10,7 +10,6 @@ ET_COMPILE=$TOP/bin/compile_et
 # we need to substitute these correctly based on configure output
 FLEX=flex
 BISON=bison
-AWK=gawk
 CC=gcc
 
 build_asn1() {
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/config.m4
index 3a60ff3240..c4057a355d 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/config.m4
@@ -3,7 +3,8 @@ AC_CHECK_HEADERS(sys/stropts.h sys/timeb.h sys/times.h sys/uio.h sys/un.h)
 AC_CHECK_HEADERS(sys/utsname.h termcap.h term.h timezone.h time.h ttyname.h netdb.h)
 
 AC_CHECK_FUNCS(setitimer uname umask unsetenv socket sendmsg putenv atexit strsep)
-AC_CHECK_FUNCS(strlwr strncasecmp strptime strsep_copy strtok_r strupr swab)
+AC_CHECK_FUNCS(strlwr strncasecmp strptime strsep_copy strtok_r strupr swab writev readv)
+AC_CHECK_FUNCS(inet_ntop)
 
 AC_CHECK_DECL(h_errno, 
               [AC_DEFINE(HAVE_DECL_H_ERRNO,1,whether h_errno is declared)], [], [
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 85a023338a..d87820d788 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -197,6 +197,10 @@ extern int DEBUGLEVEL;
 #endif
 #define discard_const_p(type, ptr) ((type *)discard_const(ptr))
 
+#ifndef HAVE_SSIZE_T
+#define ssize_t int
+#endif
+
 /*
   type safe varient of smb_xmalloc()
 */