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

Conflicts:

	source/build/smb_build/header.pm
	source/build/smb_build/makefile.pm
	source/lib/ldb/include/ldb_private.h
(This used to be commit 1a646af0647f021d99473a8991c35e616a423ea6)

diff --cc source4/build/smb_build/input.pm
Simple merge

diff --cc source4/build/smb_build/makefile.pm
index 8a99848437063d3b22eaa8f618a47dd1372b28ec,17474db00ecdabade885b1976e445f21e0548a35..23caec083fe5134a724c00996d76a75cd9edf0da
--- 1/source4/build/smb_build/makefile.pm
--- 2/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@@ -145,17 -160,36 +145,18 @@@ sub SharedModule($$
        $self->_prepare_list($ctx, "DEPEND_LIST");
        $self->_prepare_list($ctx, "LINK_FLAGS");
  
-       if (defined($ctx->{INIT_FUNCTION}) and $ctx->{TYPE} ne "PYTHON") {
 -      if (defined($ctx->{INIT_FUNCTION}) and $ctx->{TYPE} ne "PYTHON" and 
++      if (defined($ctx->{INIT_FUNCTION}) and $ctx->{TYPE} ne "PYTHON" and
+               $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/) {
 -              my $init_fn = $ctx->{INIT_FUNCTION_TYPE};
 -              $init_fn =~ s/\(\*\)/init_module/;
 -              my $proto_fn = $ctx->{INIT_FUNCTION_TYPE};
 -              $proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/;
 -
 -              $self->output(<< "__EOD__"
 -bin/$ctx->{NAME}_init_module.c:
 -      \@echo Creating \$\@
 -      \@echo \"#include \\\"includes.h\\\"\" > \$\@
 -      \@echo \"$proto_fn;\" >> \$\@
 -      \@echo \"_PUBLIC_ $init_fn\" >> \$\@
 -      \@echo \"{\" >> \$\@
 -      \@echo \"       return $ctx->{INIT_FUNCTION}();\" >> \$\@
 -      \@echo \"}\" >> \$\@
 -      \@echo \"\" >> \$\@
 -__EOD__
 -);
 -              $init_obj = "bin/$ctx->{NAME}_init_module.o";
 +              $self->output("\$($ctx->{NAME}_OBJ_LIST): CFLAGS+=-D$ctx->{INIT_FUNCTION}=init_module\n");
        }
  
        $self->output(<< "__EOD__"
 -#
  
 -$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST) $init_obj
 +$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_OBJ_LIST)
        \@echo Linking \$\@
 -      \@mkdir -p $ctx->{SHAREDDIR}
 +      \@mkdir -p \$(\@D)
-       \@\$(MDLD) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
-               \$($ctx->{NAME}\_OBJ_LIST) \\
+       \@\$(MDLD) \$(LDFLAGS) \$(MDLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
 -              \$($ctx->{NAME}\_FULL_OBJ_LIST) $init_obj \\
++              \$($ctx->{NAME}\_FULL_OBJ_LIST) \\
                \$($ctx->{NAME}_LINK_FLAGS)
  __EOD__
  );
@@@ -195,18 -243,13 +196,18 @@@ 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) \\
-               \$($ctx->{NAME}\_OBJ_LIST) \\
+       \@\$(SHLD) \$(LDFLAGS) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
+               \$($ctx->{NAME}\_FULL_OBJ_LIST) \\
                \$($ctx->{NAME}_LINK_FLAGS) \\
 -              $soarg$lns
 +              \$(if \$(SONAMEFLAG), \$(SONAMEFLAG)$ctx->{LIBRARY_SONAME})
  __EOD__
  );
 -      $self->output("\n");
 +      if ($ctx->{LIBRARY_REALNAME} ne $ctx->{LIBRARY_SONAME}) {
 +              $self->output("\t\@test \$($ctx->{NAME}_VERSION) = \$($ctx->{NAME}_SOVERSION) || ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_SONAME}\n");
 +      }
 +      $self->output("ifdef $ctx->{NAME}_SOVERSION\n");
 +      $self->output("\t\@ln -fs $ctx->{LIBRARY_REALNAME} $ctx->{SHAREDDIR}/$ctx->{LIBRARY_DEBUGNAME}\n");
 +      $self->output("endif\n");
  }
  
  sub MergedObj($$)

diff --cc source4/lib/ldb/common/ldb_modules.c
Simple merge