Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-nodeclare

(This used to be commit 7a2ff3ee26bce49a3eeeb270f4a5e4df2adbefbb)

6 files changed, 26 insertions, 19 deletions

diff --git a/source4/Makefile b/source4/Makefile
index ea98b5e469..1fddfefce3 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -14,10 +14,10 @@ SETUPDIR = $(datadir)/setup
 NCALRPCDIR = $(localstatedir)/ncalrpc
 
 BNLD = $(LD)
-BNLD_FLAGS = $(LDFLAGS)
+BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
 
 HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
-HOSTLD_FLAGS = $(LDFLAGS)
+HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
 
 default: all
 
diff --git a/source4/build/m4/check_ld.m4 b/source4/build/m4/check_ld.m4
index 3b69057a69..0d0742e5d2 100644
--- a/source4/build/m4/check_ld.m4
+++ b/source4/build/m4/check_ld.m4
@@ -13,6 +13,7 @@ LD=""
 
 AC_SUBST(BLDSHARED)
 AC_SUBST(LD)
+AC_SUBST(SYS_LDFLAGS)
 AC_SUBST(LDFLAGS)
 
 # Assume non-shared by default and override below
@@ -32,13 +33,13 @@ AC_MSG_CHECKING([whether to try to build shared libraries on $host_os])
 case "$host_os" in
 	*linux*)
 		BLDSHARED="true"
-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+		SYS_LDFLAGS="-Wl,--export-dynamic"
 		;;
 	*solaris*)
 		BLDSHARED="true"
 		if test "${GCC}" = "yes"; then
 			if test "${ac_cv_prog_gnu_ld}" = "yes"; then
-				LDFLAGS="$LDFLAGS -Wl,-E"
+				SYS_LDFLAGS="-Wl,-E"
 			fi
 		fi
 		;;
@@ -47,26 +48,26 @@ case "$host_os" in
 		;;
 	*netbsd* | *freebsd* | *dragonfly* )  
 		BLDSHARED="true"
-		LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+		SYS_LDFLAGS="-Wl,--export-dynamic"
 		;;
 	*openbsd*)
 		BLDSHARED="true"
-		LDFLAGS="$LDFLAGS -Wl,-Bdynamic"
+		SYS_LDFLAGS="-Wl,-Bdynamic"
 		;;
 	*irix*)
 		BLDSHARED="true"
 		;;
 	*aix*)
 		BLDSHARED="true"
-		LDFLAGS="$LDFLAGS -Wl,-brtl,-bexpall,-bbigtoc"
+		SYS_LDFLAGS="-Wl,-brtl,-bexpall,-bbigtoc"
 		;;
 	*hpux*)
 		# Use special PIC flags for the native HP-UX compiler.
 		BLDSHARED="true" # I hope this is correct
 		if test "$host_cpu" = "ia64"; then
-			LDFLAGS="$LDFLAGS -Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
+			SYS_LDFLAGS="-Wl,-E,+b/usr/local/lib/hpux32:/usr/lib/hpux32"
 		else
-			LDFLAGS="$LDFLAGS -Wl,-E,+b/usr/local/lib:/usr/lib"
+			SYS_LDFLAGS="-Wl,-E,+b/usr/local/lib:/usr/lib"
 		fi
 		;;
 	*osf*)
@@ -86,6 +87,8 @@ AC_MSG_CHECKING([LD])
 AC_MSG_RESULT([$LD])
 AC_MSG_CHECKING([LDFLAGS])
 AC_MSG_RESULT([$LDFLAGS])
+AC_MSG_CHECKING([SYS_LDFLAGS])
+AC_MSG_RESULT([$SYS_LDFLAGS])
 
 AC_SUBST(HOSTLD)
 
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 22b813b946..17474db00e 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -188,7 +188,7 @@ __EOD__
 $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST) $init_obj
 	\@echo Linking \$\@
 	\@mkdir -p $ctx->{SHAREDDIR}
-	\@\$(MDLD) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+	\@\$(MDLD) \$(LDFLAGS) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 		\$($ctx->{NAME}\_FULL_OBJ_LIST) $init_obj \\
 		\$($ctx->{NAME}_LINK_FLAGS)
 __EOD__
@@ -243,7 +243,7 @@ sub SharedLibrary($$)
 $ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
 	\@echo Linking \$\@
 	\@mkdir -p $ctx->{SHAREDDIR}
-	\@\$(SHLD) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+	\@\$(SHLD) \$(LDFLAGS) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 		\$($ctx->{NAME}\_FULL_OBJ_LIST) \\
 		\$($ctx->{NAME}_LINK_FLAGS) \\
 		$soarg$lns
diff --git a/source4/lib/replace/libreplace_ld.m4 b/source4/lib/replace/libreplace_ld.m4
index 2aec698967..f0d10c1e3e 100644
--- a/source4/lib/replace/libreplace_ld.m4
+++ b/source4/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/source4/lib/replace/system/network.h b/source4/lib/replace/system/network.h
index 53bef66d48..d09e3f71f8 100644
--- a/source4/lib/replace/system/network.h
+++ b/source4/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
 /*
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 82e32e1ece..626349a45d 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -370,17 +370,11 @@ MANPAGE = man/locktest.1
 # End BINARY locktest
 #################################
 
-GCOV_FLAGS = --coverage
-
 COV_TARGET = test
 
 COV_VARS = \
-	CFLAGS="$(CFLAGS) $(GCOV_FLAGS)" \
-	BNLD_FLAGS="$(BNLD_FLAGS) $(GCOV_FLAGS)" \
-	SHLD_FLAGS="$(SHLD_FLAGS) $(GCOV_FLAGS)" \
-	MDLD_FLAGS="$(MDLD_FLAGS) $(GCOV_FLAGS)" \
-	HOSTCC_FLAGS="$(HOSTCC_FLAGS) $(GCOV_FLAGS)" \
-	HOSTLD_FLAGS="$(HOSTLD_FLAGS) $(GCOV_FLAGS)"
+	CFLAGS="$(CFLAGS) --coverage" \
+	LDFLAGS="$(LDFLAGS) --coverage"
 
 test_cov:
 	-$(MAKE) $(COV_TARGET) $(COV_VARS)