[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-932-ge8f3653

[Michael Adam]

The branch, v4-0-test has been updated
       via  e8f3653414c12fb752c096d848dc962008d90439 (commit)
       via  4c77550d80b0cfc80bc2cac500fc27e0c43dad64 (commit)
      from  8c2f658a9688f0c51d2f3b948dc3213b65c7b77f (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit e8f3653414c12fb752c096d848dc962008d90439
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 1 14:23:56 2008 +0100

    NetBSD does not support AI_ADDRCONFIG
    (cherry picked from commit fb3f7f4046fa195baf5116598772d9016238637f)

commit 4c77550d80b0cfc80bc2cac500fc27e0c43dad64
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 1 20:03:05 2008 +0100

    NetBSD needs LD_LIBRARY_PATH
    (cherry picked from commit d64b19e77aa499c1ee1aaf788ddf3d6fd36253e4)

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

Summary of changes:
 source/lib/replace/libreplace_ld.m4 |    3 +++
 source/lib/replace/system/network.h |    7 +++++++
 2 files changed, 10 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/libreplace_ld.m4 b/source/lib/replace/libreplace_ld.m4
index 2aec698..f0d10c1 100644
--- a/source/lib/replace/libreplace_ld.m4
+++ b/source/lib/replace/libreplace_ld.m4
@@ -289,6 +289,9 @@ AC_DEFUN([AC_LIBREPLACE_RUNTIME_LIB_PATH_VAR],
 		*linux*)
 			LIB_PATH_VAR=LD_LIBRARY_PATH
 		;;
+		*netbsd*)
+			LIB_PATH_VAR=LD_LIBRARY_PATH
+		;;
 		*solaris*)
 			LIB_PATH_VAR=LD_LIBRARY_PATH
 		;;
diff --git a/source/lib/replace/system/network.h b/source/lib/replace/system/network.h
index 53bef66..d09e3f7 100644
--- a/source/lib/replace/system/network.h
+++ b/source/lib/replace/system/network.h
@@ -163,8 +163,15 @@ void rep_freeifaddrs(struct ifaddrs *);
 #endif
 
 #ifndef AI_ADDRCONFIG
+/*
+ * logic copied from AI_NUMERICHOST
+ */
+#if defined(HAVE_STRUCT_ADDRINFO) && defined(HAVE_GETADDRINFO)
+#define AI_ADDRCONFIG	0
+#else
 #define AI_ADDRCONFIG	0x0020
 #endif
+#endif
 
 #ifndef AI_NUMERICSERV
 /*


-- 
Samba Shared Repository