From 07d3da54fc7e75926fbd8f4c23805f6a6f89618e Mon Sep 17 00:00:00 2001
From: Georgi Kodinov <joro@sun.com>
Date: Fri, 20 Mar 2009 13:18:29 +0200
Subject: [PATCH] reverting a bogus fix into 5.1-bugteam

---
 configure.in        | 12 ++++--------
 include/Makefile.am |  8 +++++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/configure.in b/configure.in
index 7c7b7eddf0a..d86218bd782 100644
--- a/configure.in
+++ b/configure.in
@@ -1678,17 +1678,14 @@ if test "$with_debug" = "yes"
 then
   # Medium debug.
   AC_DEFINE([DBUG_ON], [1], [Use libdbug])
-  AC_DEFINE([SAFE_MUTEX], [1], [Use safe mutexes])
-  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS"
-  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS"
+  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"
+  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
 elif test "$with_debug" = "full"
 then
   # Full debug. Very slow in some cases
   AC_DEFINE([DBUG_ON], [1], [Use libdbug])
-  AC_DEFINE([SAFE_MUTEX], [1], [Use safe mutexes])
-  AC_DEFINE([SAFEMALLOC], [1], [Use safe malloc])
-  CFLAGS="$DEBUG_CFLAGS $CFLAGS"
-  CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS"
+  CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
+  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
 else
   # Optimized version. No debug
   AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])
@@ -2815,7 +2812,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  include/mysql_version.h plugin/Makefile win/Makefile)
 
 AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
-AC_CONFIG_COMMANDS([my_config.h], cp include/config.h include/my_config.h)
 
 # Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS
 AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'")
diff --git a/include/Makefile.am b/include/Makefile.am
index de13a418c0c..64f73af8606 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -15,8 +15,9 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-BUILT_SOURCES =		link_sources
-HEADERS_GEN_CONFIGURE =		mysql_version.h my_config.h
+BUILT_SOURCES =		$(HEADERS_GEN_MAKE) link_sources
+HEADERS_GEN_CONFIGURE =		mysql_version.h
+HEADERS_GEN_MAKE =		my_config.h
 HEADERS_ABI =		mysql.h mysql_com.h mysql_time.h \
 			my_list.h my_alloc.h typelib.h mysql/plugin.h
 pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
@@ -25,7 +26,8 @@ pkginclude_HEADERS =	$(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
 			decimal.h errmsg.h my_global.h my_net.h \
 			my_getopt.h sslopt-longopts.h my_dir.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE)
+			m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
+			$(HEADERS_GEN_MAKE)
 
 noinst_HEADERS =	config-win.h config-netware.h my_bit.h \
 			heap.h my_bitmap.h my_uctype.h \