[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2154-gd2bb72d

Björn Jacke bjacke at samba.org
Mon Jun 8 20:12:52 GMT 2009


The branch, master has been updated
       via  d2bb72d713d9c339c00536256f44dacf51e57414 (commit)
      from  6dd1f99ec09aff71f04d103554e848e0ddcf0cb7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d2bb72d713d9c339c00536256f44dacf51e57414
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Jun 8 22:11:33 2009 +0200

    s4:heimdal: fix build on FreeBSD
    
    Patch from Timur I. Bakeyev sent to samba-technical:
    
    Heimdal requires openpty() presence. FreeBSD has in in standard libc, so
    autodetection works, but compilation fails, as declaration of this function is
    missing.
    
    This patch adds proper header detection and inclusion for openpty().

-----------------------------------------------------------------------

Summary of changes:
 source4/heimdal/lib/roken/rkpty.c |    3 +++
 source4/heimdal_build/internal.m4 |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/lib/roken/rkpty.c b/source4/heimdal/lib/roken/rkpty.c
index 3094697..ebc3a5d 100644
--- a/source4/heimdal/lib/roken/rkpty.c
+++ b/source4/heimdal/lib/roken/rkpty.c
@@ -48,6 +48,9 @@
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 
 #include "roken.h"
 #include <getarg.h>
diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4
index 4cd7521..5c8d78e 100644
--- a/source4/heimdal_build/internal.m4
+++ b/source4/heimdal_build/internal.m4
@@ -52,7 +52,6 @@ AC_CHECK_HEADERS([				\
 	errno.h					\
 	inttypes.h				\
 	netdb.h					\
-	pty.h					\
 	signal.h				\
 	sys/bswap.h				\
 	sys/file.h				\
@@ -164,6 +163,7 @@ m4_include(heimdal/cf/find-func-no-libs.m4)
 m4_include(heimdal/cf/find-func-no-libs2.m4)
 m4_include(heimdal/cf/resolv.m4)
 
+AC_CHECK_HEADERS([pty.h util.h libutil.h])
 
 AC_CHECK_LIB_EXT(util, OPENPTY_LIBS, openpty)
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list