Attachment 6773 Details for Bug 8369 – patch for 3.6

[patch] patch for 3.6

0001-s3-build-autoconf-fix-bug-8369-remove-irritating-.-t.patch (text/plain), 6.37 KB, created by Michael Adam on 2011-08-11 10:51:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2011-08-11 10:51:39 UTC

Size: 6.37 KB

patch

obsolete

>From df472e0824e3aef64975615869873941ccc6aee5 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Thu, 11 Aug 2011 10:49:30 +0200
>Subject: [PATCH] s3:build(autoconf): fix bug #8369: remove irritating "." targets when recent system libs exist
>
>---
> source3/Makefile.in   |   18 +++++++++---------
> source3/configure.in  |    4 ++++
> source3/m4/aclocal.m4 |    6 ++++++
> 3 files changed, 19 insertions(+), 9 deletions(-)
>
>diff --git a/source3/Makefile.in b/source3/Makefile.in
>index 4a79f97..41bd45d 100644
>--- a/source3/Makefile.in
>+++ b/source3/Makefile.in
>@@ -2054,8 +2054,8 @@ LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
> LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
> LIBTALLOC_SOVER=@LIBTALLOC_SOVER@
> LIBTALLOC_FULLVER=@LIBTALLOC_FULLVER@
>-LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
>-LIBTALLOC_SHARED_TARGET_FULLVER=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_FULLVER)
>+LIBTALLOC_SHARED_TARGET_SONAME=@LIBTALLOC_SHARED_TARGET_SOVER@
>+LIBTALLOC_SHARED_TARGET_FULLVER=@LIBTALLOC_SHARED_TARGET_FULLVER@
> LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
> LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@
> LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
>@@ -2145,8 +2145,8 @@ LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
> LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
> LIBTDB_SOVER=@LIBTDB_SOVER@
> LIBTDB_FULLVER=@LIBTDB_FULLVER@
>-LIBTDB_SHARED_TARGET_SONAME=$(LIBTDB_SHARED_TARGET).$(LIBTDB_SOVER)
>-LIBTDB_SHARED_TARGET_FULLVER=$(LIBTDB_SHARED_TARGET).$(LIBTDB_FULLVER)
>+LIBTDB_SHARED_TARGET_SONAME=@LIBTDB_SHARED_TARGET_SOVER@
>+LIBTDB_SHARED_TARGET_FULLVER=@LIBTDB_SHARED_TARGET_FULLVER@
> LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
> LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@
> LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
>@@ -2251,7 +2251,7 @@ LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
> LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
> LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
> LIBWBCLIENT_FULLVER=@LIBWBCLIENT_FULLVER@
>-LIBWBCLIENT_SHARED_TARGET_SONAME=$(LIBWBCLIENT_SHARED_TARGET).$(LIBWBCLIENT_SOVER)
>+LIBWBCLIENT_SHARED_TARGET_SONAME=@LIBWBCLIENT_SHARED_TARGET_SOVER@
> LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
> LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@
> LIBWBCLIENT_HEADERS=$(srcdir)/../nsswitch/libwbclient/wbclient.h
>@@ -2331,7 +2331,7 @@ showlibs:: showlibwbclient
> LIBADDNS_SHARED_TARGET=@LIBADDNS_SHARED_TARGET@
> LIBADDNS_SOVER=@LIBADDNS_SOVER@
> LIBADDNS_FULLVER=@LIBADDNS_FULLVER@
>-LIBADDNS_SHARED_TARGET_SONAME=$(LIBADDNS_SHARED_TARGET).$(LIBADDNS_SOVER)
>+LIBADDNS_SHARED_TARGET_SONAME=@LIBADDNS_SHARED_TARGET_SOVER@
> LIBADDNS_STATIC_TARGET=@LIBADDNS_STATIC_TARGET@
> LIBADDNS=@LIBADDNS_STATIC@ @LIBADDNS_SHARED@
> #LIBADDNS_SYMS=$(srcdir)/exports/libaddns.@SYMSEXT@
>@@ -2440,7 +2440,7 @@ LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
> LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
> LIBNETAPI_SOVER=@LIBNETAPI_SOVER@
> LIBNETAPI_FULLVER=@LIBNETAPI_FULLVER@
>-LIBNETAPI_SHARED_TARGET_SONAME=$(LIBNETAPI_SHARED_TARGET).$(LIBNETAPI_SOVER)
>+LIBNETAPI_SHARED_TARGET_SONAME=@LIBNETAPI_SHARED_TARGET_SOVER@
> LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@
> LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.@SYMSEXT@
> LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
>@@ -2520,7 +2520,7 @@ showlibs:: showlibnetapi
> LIBSMBCLIENT_SHARED_TARGET=@LIBSMBCLIENT_SHARED_TARGET@
> LIBSMBCLIENT_SOVER=@LIBSMBCLIENT_SOVER@
> LIBSMBCLIENT_FULLVER=@LIBSMBCLIENT_FULLVER@
>-LIBSMBCLIENT_SHARED_TARGET_SONAME=$(LIBSMBCLIENT_SHARED_TARGET).$(LIBSMBCLIENT_SOVER)
>+LIBSMBCLIENT_SHARED_TARGET_SONAME=@LIBSMBCLIENT_SHARED_TARGET_SOVER@
> LIBSMBCLIENT_STATIC_TARGET=@LIBSMBCLIENT_STATIC_TARGET@
> LIBSMBCLIENT=@LIBSMBCLIENT_STATIC@ @LIBSMBCLIENT_SHARED@
> LIBSMBCLIENT_SYMS=$(srcdir)/exports/libsmbclient.@SYMSEXT@
>@@ -2608,7 +2608,7 @@ LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0)
> LIBSMBSHAREMODES_SHARED_TARGET=@LIBSMBSHAREMODES_SHARED_TARGET@
> LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@
> LIBSMBSHAREMODES_FULLVER=@LIBSMBSHAREMODES_FULLVER@
>-LIBSMBSHAREMODES_SHARED_TARGET_SONAME=$(LIBSMBSHAREMODES_SHARED_TARGET).$(LIBSMBSHAREMODES_SOVER)
>+LIBSMBSHAREMODES_SHARED_TARGET_SONAME=@LIBSMBSHAREMODES_SHARED_TARGET_SOVER@
> LIBSMBSHAREMODES_STATIC_TARGET=@LIBSMBSHAREMODES_STATIC_TARGET@
> LIBSMBSHAREMODES=@LIBSMBSHAREMODES_STATIC@ @LIBSMBSHAREMODES_SHARED@
> LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/libsmbsharemodes.@SYMSEXT@
>diff --git a/source3/configure.in b/source3/configure.in
>index af8285f..59c2ef9 100644
>--- a/source3/configure.in
>+++ b/source3/configure.in
>@@ -72,6 +72,8 @@ AC_SUBST(UNINSTALLLIBCMD_A)
> AC_SUBST(INSTALL_LIBWBCLIENT)
> AC_SUBST(UNINSTALL_LIBWBCLIENT)
> AC_SUBST(LIBWBCLIENT_SHARED_TARGET)
>+AC_SUBST(LIBWBCLIENT_SHARED_TARGET_SOVER)
>+AC_SUBST(LIBWBCLIENT_SHARED_TARGET_FULLVER)
> AC_SUBST(LIBWBCLIENT_SHARED)
> AC_SUBST(LIBWBCLIENT_STATIC_TARGET)
> AC_SUBST(LIBWBCLIENT_STATIC)
>@@ -6413,6 +6415,8 @@ else
> 	LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
> 	LIBWBCLIENT_SOVER=0
> 	LIBWBCLIENT_FULLVER=0
>+	LIBWBCLIENT_SHARED_TARGET_SOVER=$LIBWBCLIENT_SHARED_TARGET.$LIBWBCLIENT_SOVER
>+	LIBWBCLIENT_SHARED_TARGET_FULLVER=$LIBWBCLIENT_SHARED_TARGET.$LIBWBCLIENT_FULLVER
> 	if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
> 		NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
> 		## Only worry about libwbclient if we have shared
>diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
>index afd7c74..6112a64 100644
>--- a/source3/m4/aclocal.m4
>+++ b/source3/m4/aclocal.m4
>@@ -76,6 +76,9 @@ LIBUC[_TARGET]=
> m4_if([$2], [], [LIBUC[_SOVER]=0], [LIBUC[_SOVER]=$2])
> m4_if([$3], [], [LIBUC[_FULLVER]=$LIBUC[_SOVER]], [LIBUC[_FULLVER]=$3])
> 
>+LIBUC[_SHARED_TARGET_SOVER]=$LIBUC[_SHARED_TARGET].$LIBUC[_SOVER]
>+LIBUC[_SHARED_TARGET_FULLVER]=$LIBUC[_SHARED_TARGET].$LIBUC[_FULLVER]
>+
> AC_SUBST(LIBUC[_SHARED_TARGET])
> AC_SUBST(LIBUC[_STATIC_TARGET])
> AC_SUBST(LIBUC[_SHARED])
>@@ -86,6 +89,8 @@ AC_SUBST([INSTALL_]LIBUC)
> AC_SUBST([UNINSTALL_]LIBUC)
> AC_SUBST(LIBUC[_SOVER])
> AC_SUBST(LIBUC[_FULLVER])
>+AC_SUBST(LIBUC[_SHARED_TARGET_SOVER])
>+AC_SUBST(LIBUC[_SHARED_TARGET_FULLVER])
> 
> AC_MSG_CHECKING([whether to build the LIBNAME shared library])
> m4_if([$4], [no], [
>@@ -142,6 +147,7 @@ if eval test x"$build_lib" = "xyes" ; then
> 	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
>-- 
>1.7.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 8369: 6771 | 6773