From f9eb77477b82740814e6143837d8a70f8090b9a5 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 1 Apr 2009 00:37:47 +0200 Subject: s3:build: first cut at fixing linking of shared/static libs internally This is based on a patch from the debian packages by Steve Langasek . It removes the static libs from the object collections. For those libs that are set up with SMB_LIBRARY(). Michael --- source3/m4/aclocal.m4 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'source3/m4/aclocal.m4') diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4 index dff4970b2c..5a07eddb94 100644 --- a/source3/m4/aclocal.m4 +++ b/source3/m4/aclocal.m4 @@ -68,7 +68,8 @@ LIBUC[_SHARED_TARGET]=bin/LIBNAME.$SHLIBEXT LIBUC[_STATIC_TARGET]=bin/LIBNAME.a LIBUC[_SHARED]= LIBUC[_STATIC]= -LIBUC[_LIBS]= +LIBUC[_LIBS]=LIBLIBS +LIBUC[_TARGET]= [INSTALL_]LIBUC= [UNINSTALL_]LIBUC= @@ -79,6 +80,7 @@ AC_SUBST(LIBUC[_STATIC_TARGET]) AC_SUBST(LIBUC[_SHARED]) AC_SUBST(LIBUC[_STATIC]) AC_SUBST(LIBUC[_LIBS]) +AC_SUBST(LIBUC[_TARGET]) AC_SUBST([INSTALL_]LIBUC) AC_SUBST([UNINSTALL_]LIBUC) AC_SUBST(LIBUC[_SOVER]) @@ -137,14 +139,18 @@ if eval test x"$build_lib" = "xyes" ; then [UNINSTALL_]LIBUC=[uninstall]LIBNAME if eval $BLDSHARED = true; then LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET] + LIBUC[_TARGET]=$LIBUC[_SHARED_TARGET] AC_MSG_RESULT(yes) if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then enable_static=yes + LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET] + LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET] else LIBUC[_LIBS]=LIBLIBS fi else enable_static=yes + LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET] AC_MSG_RESULT(no shared library support -- will supply static library) fi else -- cgit