From 9f86a9bdcc22084f0287e21810c4aa6c69cdc272 Mon Sep 17 00:00:00 2001
From: "kent@mysql.com" <>
Date: Thu, 9 Feb 2006 03:11:45 +0100
Subject: [PATCH] Makefile.am:   Link with CLIENT_EXTRA_LDFLAGS, enable us to  
 pass on libtool flags '-full-static' and '-static'   using
 '--with-client-ldflags' to configure. mysql.spec.sh:   Pass '-static' to
 libtool, link static with our   own libraries, dynamic with system libraries.
   Link with the bundled zlib.

---
 server-tools/instance-manager/Makefile.am | 3 ++-
 support-files/mysql.spec.sh               | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 7449735f0bf..7afadf03ec1 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -79,7 +79,8 @@ mysqlmanager_SOURCES=	command.cc command.h mysqlmanager.cc \
                         mysql_manager_error.h \
                         portability.h
 
-mysqlmanager_LDADD=	liboptions.a \
+mysqlmanager_LDADD=	@CLIENT_EXTRA_LDFLAGS@ \
+			liboptions.a \
 			libnet.a \
 			$(top_builddir)/vio/libvio.a \
 			$(top_builddir)/mysys/libmysys.a \
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 24f5ce41824..62f2bdb668d 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -217,6 +217,9 @@ sh -c  "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
 	CXXFLAGS=\"$CXXFLAGS\" \
 	./configure \
  	    $* \
+	    --with-mysqld-ldflags='-static' \
+	    --with-client-ldflags='-static' \
+	    --with-zlib-dir=bundled \
 	    --enable-assembler \
 	    --enable-local-infile \
             --with-mysqld-user=%{mysqld_user} \