From d249218105081335be1c562acedcdff6e1f39a00 Mon Sep 17 00:00:00 2001
From: unknown <lenz@mysql.com>
Date: Fri, 30 Jul 2004 13:52:44 +0200
Subject: [PATCH]  - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql
 link    flags to enable static linking (to avoid having a shared lib   
 dependency in the Linux RPMs)  - Disabled OpenSSL in the Max RPM

sql/Makefile.am:
   - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link
     flags to enable static linking (to avoid having a shared lib
     dependency in the Linux Server RPMs)
support-files/mysql.spec.sh:
   - Disable OpenSSL in the Max RPM
---
 sql/Makefile.am             |  2 +-
 support-files/mysql.spec.sh | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/sql/Makefile.am b/sql/Makefile.am
index 9859f1ef841..4eaf6d5377e 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -96,7 +96,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.cc \
 gen_lex_hash_SOURCES =	gen_lex_hash.cc
 gen_lex_hash_LDADD =	$(LDADD) $(CXXLDFLAGS)
 mysql_tzinfo_to_sql_SOURCES =   mysql_tzinfo_to_sql.cc
-mysql_tzinfo_to_sql_LDADD =     $(LDADD) $(CXXLDFLAGS)
+mysql_tzinfo_to_sql_LDADD =  @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)
 
 DEFS =			-DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index d5c43e61f9d..35e8b647522 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -149,7 +149,7 @@ languages and applications need to dynamically load and use MySQL.
 
 %package Max
 Release: %{release}
-Summary: MySQL - server with Berkeley DB, OpenSSL, RAID and UDF support
+Summary: MySQL - server with Berkeley DB, RAID and UDF support
 Group: Applications/Databases
 Provides: mysql-Max
 Obsoletes: mysql-Max
@@ -157,7 +157,7 @@ Requires: MySQL >= 4.0
 
 %description Max 
 Optional MySQL server binary that supports additional features like
-Berkeley DB, OpenSSL, RAID and User Defined Functions (UDFs).
+Berkeley DB, RAID and User Defined Functions (UDFs).
 To activate this binary, just install this package in addition to
 the standard MySQL package.
 
@@ -269,7 +269,7 @@ then
 fi
 
 BuildMySQL "--enable-shared \
-		--with-openssl \
+		--without-openssl \
 		--with-berkeley-db \
 		--with-innodb \
 		--with-raid \
@@ -579,6 +579,11 @@ fi
 # The spec file changelog only includes changes made to the spec file
 # itself
 %changelog 
+* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
+
+- disabled OpenSSL in the Max binaries again (the RPM packages were the
+  only exception to this anyway) (BUG 1043)
+
 * Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
 
 - fixed server postinstall (mysql_install_db was called with the wrong
-- 
2.30.9