[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  0da7295 lib/texpect: prefer bsd/libutil.h if available
       via  349ba51 s4:heimdal_build: remove unused openpty check
      from  5fefdbc libcli-dns: Remove obsolete dns_host_file subsystem.

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


- Log -----------------------------------------------------------------
commit 0da7295fbc34170385d2b6bd165685aa092ab0ec
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Dec 10 12:23:04 2014 +0000

    lib/texpect: prefer bsd/libutil.h if available
    
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Günther Deschner <gd at samba.org>
    Autobuild-Date(master): Thu Dec 18 16:31:48 CET 2014 on sn-devel-104

commit 349ba5188a93a3d4679de4908af8cef8cf0862cb
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Dec 18 02:05:28 2014 +0000

    s4:heimdal_build: remove unused openpty check
    
    commit 638a8edd7ce708cf550c054ac16dade795b6448b removed
    HEIMDAL_BINARY('rkpty', 'lib/roken/rkpty.c',...)
    (the only heimdal user of openpty().
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>

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

Summary of changes:
 lib/texpect/texpect.c                   | 4 +++-
 lib/texpect/wscript                     | 2 +-
 source4/heimdal_build/wscript_configure | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/texpect/texpect.c b/lib/texpect/texpect.c
index d788081..75a32f4 100644
--- a/lib/texpect/texpect.c
+++ b/lib/texpect/texpect.c
@@ -41,7 +41,9 @@
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif
-#ifdef HAVE_LIBUTIL_H
+#ifdef HAVE_BSD_LIBUTIL_H
+#include <bsd/libutil.h>
+#elif defined HAVE_LIBUTIL_H
 #include <libutil.h>
 #endif
 
diff --git a/lib/texpect/wscript b/lib/texpect/wscript
index 4163ca1..62a1d4d 100644
--- a/lib/texpect/wscript
+++ b/lib/texpect/wscript
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 def configure(conf):
-    conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h libutil.h')
+    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)
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index 5b7109e..9a68656 100755
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -64,7 +64,6 @@ conf.CHECK_FUNCS_IN('res_search res_nsearch res_ndestroy dns_search dn_expand',
                     checklibc=True, headers='netinet/in.h arpa/nameser.h resolv.h dns.h')
 conf.CHECK_VARIABLE('_res', headers='netinet/in.h arpa/nameser.h resolv.h')
 conf.CHECK_DECLS('_res', headers='netinet/in.h arpa/nameser.h resolv.h')
-conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h libutil.h')
 
 conf.DEFINE('HAVE_KRB5',1)
 


-- 
Samba Shared Repository