From: Volker Lendecke <vl@samba.org>
Date: Wed, 20 May 2009 06:58:13 +0000 (+0200)
Subject: Do not do a merged build without shared libs
X-Git-Tag: tdb-1.1.5~470
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3b5e286d062fe2e82ea0ac4820bd036f3882db9;p=thirdparty%2Fsamba.git

Do not do a merged build without shared libs

Jelmer, you might want to take a look at Andrew B's problem with

--enable-developer --disable-shared --disable-shared-libs
---

diff --git a/source3/configure.in b/source3/configure.in
index e505253a522..44374b989cb 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1804,6 +1804,7 @@ if test x"$BLDSHARED" != x"true"; then
 	SHLD="shared-libraries-disabled"
 	PICFLAG="${PIE_CFLAGS}"
 	SHLIBEXT="shared_libraries_disabled"
+	merged_build_possible=no
 fi
 
 AC_MSG_CHECKING([used PICFLAG])