[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2945-g24459c7

[obnox@xxxxxxxxx (Michael Adam)]

The branch, v3-2-test has been updated
       via  24459c7eda080a4fed2d4f2a576c97f878f905f9 (commit)
       via  f3ad03d0f909ff862411511d9f63e77047034c01 (commit)
       via  8dd57f31b2ba621654f989e1ed58bd2dd80b7849 (commit)
      from  d0a4b9f69984ca5da0007af91013f1bc78dcbf2b (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 24459c7eda080a4fed2d4f2a576c97f878f905f9
Author: Michael Adam <obnox@xxxxxxxxx>
Date:   Wed Aug 20 14:56:18 2008 +0200

    build: fix bug #5590 by not linking in the static libs but the objects.
    
    Michael
    (cherry picked from commit 6ad2090391a92ebe822b2d7b80e180c251dc8e7a)

commit f3ad03d0f909ff862411511d9f63e77047034c01
Author: Michael Adam <obnox@xxxxxxxxx>
Date:   Wed Aug 20 14:55:24 2008 +0200

    build: fall down to the same place when using an internal lib statically.
    
    Michael
    (cherry picked from commit 702c0bc04668117e3521d687b9b5a87fd7e0f1b1)

commit 8dd57f31b2ba621654f989e1ed58bd2dd80b7849
Author: Michael Adam <obnox@xxxxxxxxx>
Date:   Wed Aug 20 13:22:13 2008 +0200

    build: rename LIBNETAPI_OBJ1 to LIBNETAPI_OBJ0 for consistency.
    
    Michael
    (cherry picked from commit ead9b9d7167d999d73cf4111f3b321236aac2a15)

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

Summary of changes:
 source/Makefile.in   |    8 ++++----
 source/m4/aclocal.m4 |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 11f7085..2a8bec0 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1798,7 +1798,7 @@ shlibs test_shlibs: @LIBADDNS_SHARED@
 #
 #-------------------------------------------------------------------
 
-LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
+LIBNETAPI_OBJ0 = lib/netapi/netapi.o \
                 lib/netapi/cm.o \
                 librpc/gen_ndr/ndr_libnetapi.o \
                 lib/netapi/libnetapi.o \
@@ -1807,7 +1807,7 @@ LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
                 lib/netapi/getdc.o \
                 lib/netapi/user.o
 
-LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
+LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
                 $(LIBSMBCONF_OBJ) \
                 $(REG_SMBCONF_OBJ) \
                 $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
@@ -1838,9 +1838,9 @@ $(LIBNETAPI_SHARED_TARGET): 
$(LIBNETAPI_SHARED_TARGET_SONAME)
        @rm -f $@
        @ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
 
-$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1)
+$(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ0)
        @echo Linking non-shared library $@
-       @-$(AR) -rc $@ $(LIBNETAPI_OBJ1)
+       @-$(AR) -rc $@ $(LIBNETAPI_OBJ0)
 
 libnetapi: $(LIBNETAPI)
 
diff --git a/source/m4/aclocal.m4 b/source/m4/aclocal.m4
index 53ad46c..9a4213d 100644
--- a/source/m4/aclocal.m4
+++ b/source/m4/aclocal.m4
@@ -139,7 +139,7 @@ if eval test x"$build_lib" = "xyes" ; then
                LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
                AC_MSG_RESULT(yes)
                if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = 
"xSTATIC" ; then
-                       LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
+                       enable_static=yes
                else
                        LIBUC[_LIBS]=LIBLIBS
                fi
@@ -152,7 +152,7 @@ else
        AC_MSG_RESULT(shared library not selected, but will supply static 
library)
 fi
 if test $enable_static = yes; then
-       LIBUC[_STATIC]=$LIBUC[_STATIC_TARGET]
+       LIBUC[_STATIC]=[\$\(]LIBUC[_OBJ0\)]
 fi
 
 m4_popdef([LIBNAME])


-- 
Samba Shared Repository