Merge module linking changes from SAMBA_3_2 to SAMBA_3_2_0 to reduce
authorjpeach <jpeach@0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Sat, 29 Sep 2007 23:54:32 +0000 (23:54 +0000)
committerjpeach <jpeach@0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Sat, 29 Sep 2007 23:54:32 +0000 (23:54 +0000)
spurious tree differences.

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_2@25432 0c0555d6-39d7-0310-84fc-f1cc0bd64818

source/Makefile.in
source/configure.in
source/exports/modules-darwin.syms [moved from source/modules/exports.darwin with 100% similarity]

index 4ab22ab..3713908 100644 (file)
@@ -6,6 +6,7 @@
 # Copyright (C) 2003 Jim McDonough <jmcd@us.ibm.com>
 # Copyright (C) 2002-2003 Jelmer Vernooij <jelmer@samba.org>
 # Copyright (C) 2006 Lars Mueller <lars@samba.org>
+# Copyright (C) 2007 James Peach <jpeach@samba.org>
 ###########################################################################
 
 prefix=@prefix@
@@ -27,6 +28,10 @@ DSO_EXPORTS=@DSO_EXPORTS@
 SONAME_VER=`grep ^$@ $(builddir)/library-versions | cut -d: -f2`
 SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
 
+# The MODULE_EXPORTS variable contains the platform-specific linker flags
+# needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules.
+MODULE_EXPORTS=@MODULE_EXPORTS@
+
 # Add $(DEVELOPER_CFLAGS) to $(CFLAGS) to enable extra compiler
 # (GCC) warnings. This is done automtically for --enable-developer
 # and --enable-krb5developer.
@@ -39,10 +44,6 @@ AR=@AR@
 LDSHFLAGS=@LDSHFLAGS@ @LDFLAGS@
 LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@
 
-# The MODULE_EXPORTS variable conatins the platform-specific linker flags
-# needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules.
-MODULE_EXPORTS=@MODULE_EXPORTS@
-
 WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
 AWK=@AWK@
 PICFLAG=@PICFLAG@
@@ -1433,7 +1434,7 @@ bin/librpc_unixinfo.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_UNIXINFO_OBJ)
 
 bin/librpc_epmapper.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_EPMAPPER_OBJ)
        @echo "Linking $@"
-       @$(SHLD_MODULE) $(RPC_SVC_OBJ)
+       @$(SHLD_MODULE) $(RPC_EPMAPPER_OBJ)
 
 bin/librpc_srvsvc.@SHLIBEXT@: $(BINARY_PREREQS) $(RPC_SVC_OBJ)
        @echo "Linking $@"
index d546e26..2e1b7c7 100644 (file)
@@ -280,9 +280,9 @@ dnl Unique-to-Samba variables we'll be playing with.
 AC_SUBST(SAMBA_CPPFLAGS)
 AC_SUBST(SHELL)
 AC_SUBST(LDSHFLAGS)
-AC_SUBST(MODULE_EXPORTS)
 AC_SUBST(SONAMEFLAG)
 AC_SUBST(SHLD)
+AC_SUBST(MODULE_EXPORTS)
 AC_SUBST(DSO_EXPORTS)
 AC_SUBST(HOST_OS)
 AC_SUBST(PICFLAG)
@@ -2029,7 +2029,7 @@ case "$host_os" in
                *darwin*)   AC_DEFINE(DARWINOS,1,[Whether the host os is Darwin/MacOSX])
                        BLDSHARED="true"
                        LDSHFLAGS="-bundle -flat_namespace -undefined suppress"
-                       MODULE_EXPORTS="-exported_symbols_list \$(srcdir)/modules/exports.darwin"
+                       MODULE_EXPORTS="-exported_symbols_list \$(srcdir)/exports/modules-darwin.syms"
                        SHLIBEXT="dylib"
                        # Since gcc doesn't fail on unrecognised options, the
                        # PIE test incorrectly succeeds. Darwin gcc does not