--- mysql-5.0.32/tests/Makefile.in	2006-12-15 17:05:31.000000000 +0100
+++ mysql-5.0.32-new/tests/Makefile.in	2006-12-15 20:04:01.567022750 +0100
@@ -56,7 +56,7 @@
 target_triplet = @target@
 bin_PROGRAMS = mysql_client_test$(EXEEXT)
 noinst_PROGRAMS = insert_test$(EXEEXT) select_test$(EXEEXT) \
-	thread_test$(EXEEXT) bug25714$(EXEEXT)
+	bug25714$(EXEEXT)
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -96,7 +96,7 @@
 am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
 	my_memmem.$(OBJEXT)
 mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la
+am__DEPENDENCIES_1 = $(top_builddir)/libmysql/.libs/libmysqlclient.a
 am__DEPENDENCIES_2 =
 mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2)
@@ -106,7 +106,7 @@
 thread_test_SOURCES = thread_test.c
 thread_test_OBJECTS = thread_test.$(OBJEXT)
 thread_test_LDADD = $(LDADD)
-thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
+thread_test_DEPENDENCIES = $(top_builddir)/libmysql/.libs/libmysqlclient.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -405,7 +405,7 @@
 			$(openssl_includes)
 
 LDADD = @CLIENT_EXTRA_LDFLAGS@ \
-                        $(top_builddir)/libmysql/libmysqlclient.la
+                        $(top_builddir)/libmysql/.libs/libmysqlclient.a
 
 mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)

--- mysql-5.0.32/client/Makefile.in	2006-12-15 17:05:11.000000000 +0100
+++ mysql-5.0.32-new/client/Makefile.in	2006-12-15 20:06:19.335632750 +0100
@@ -93,7 +93,7 @@
 am_mysql_OBJECTS = mysql.$(OBJEXT) readline.$(OBJEXT) \
 	sql_string.$(OBJEXT) completion_hash.$(OBJEXT)
 mysql_OBJECTS = $(am_mysql_OBJECTS)
-am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la
+am__DEPENDENCIES_1 = $(top_builddir)/libmysql/.libs/libmysqlclient.la
 am__DEPENDENCIES_2 =
 mysql_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 am_mysql_upgrade_OBJECTS = mysql_upgrade.$(OBJEXT) \
@@ -101,11 +101,11 @@
 mysql_upgrade_OBJECTS = $(am_mysql_upgrade_OBJECTS)
 mysql_upgrade_LDADD = $(LDADD)
 mysql_upgrade_DEPENDENCIES =  \
-	$(top_builddir)/libmysql/libmysqlclient.la
+	$(top_builddir)/libmysql/.libs/libmysqlclient.la
 am_mysqladmin_OBJECTS = mysqladmin.$(OBJEXT)
 mysqladmin_OBJECTS = $(am_mysqladmin_OBJECTS)
 mysqladmin_LDADD = $(LDADD)
-mysqladmin_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
+mysqladmin_DEPENDENCIES = $(top_builddir)/libmysql/.libs/libmysqlclient.la
 am_mysqlbinlog_OBJECTS = mysqlbinlog.$(OBJEXT) mf_tempdir.$(OBJEXT) \
 	my_new.$(OBJEXT)
 mysqlbinlog_OBJECTS = $(am_mysqlbinlog_OBJECTS)
@@ -113,20 +113,20 @@
 am_mysqlcheck_OBJECTS = mysqlcheck.$(OBJEXT)
 mysqlcheck_OBJECTS = $(am_mysqlcheck_OBJECTS)
 mysqlcheck_LDADD = $(LDADD)
-mysqlcheck_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
+mysqlcheck_DEPENDENCIES = $(top_builddir)/libmysql/.libs/libmysqlclient.a
 am_mysqldump_OBJECTS = mysqldump.$(OBJEXT) my_user.$(OBJEXT) \
 	mf_getdate.$(OBJEXT)
 mysqldump_OBJECTS = $(am_mysqldump_OBJECTS)
 mysqldump_LDADD = $(LDADD)
-mysqldump_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
+mysqldump_DEPENDENCIES = $(top_builddir)/libmysql/.libs/libmysqlclient.a
 am_mysqlimport_OBJECTS = mysqlimport.$(OBJEXT)
 mysqlimport_OBJECTS = $(am_mysqlimport_OBJECTS)
 mysqlimport_LDADD = $(LDADD)
-mysqlimport_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
+mysqlimport_DEPENDENCIES = $(top_builddir)/libmysql/.libs/libmysqlclient.a
 am_mysqlshow_OBJECTS = mysqlshow.$(OBJEXT)
 mysqlshow_OBJECTS = $(am_mysqlshow_OBJECTS)
 mysqlshow_LDADD = $(LDADD)
-mysqlshow_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
+mysqlshow_DEPENDENCIES = $(top_builddir)/libmysql/.libs/libmysqlclient.a
 am_mysqltest_OBJECTS = mysqltest.$(OBJEXT) my_getsystime.$(OBJEXT) \
 	my_copy.$(OBJEXT)
 mysqltest_OBJECTS = $(am_mysqltest_OBJECTS)
@@ -136,12 +136,12 @@
 mysqltestmanager_pwgen_OBJECTS = $(am_mysqltestmanager_pwgen_OBJECTS)
 mysqltestmanager_pwgen_LDADD = $(LDADD)
 mysqltestmanager_pwgen_DEPENDENCIES =  \
-	$(top_builddir)/libmysql/libmysqlclient.la
+	$(top_builddir)/libmysql/.libs/libmysqlclient.a
 am_mysqltestmanagerc_OBJECTS = mysqlmanagerc.$(OBJEXT)
 mysqltestmanagerc_OBJECTS = $(am_mysqltestmanagerc_OBJECTS)
 mysqltestmanagerc_LDADD = $(LDADD)
 mysqltestmanagerc_DEPENDENCIES =  \
-	$(top_builddir)/libmysql/libmysqlclient.la
+	$(top_builddir)/libmysql/.libs/libmysqlclient.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -452,7 +452,7 @@
                                 $(openssl_includes)
 
 LDADD = @CLIENT_EXTRA_LDFLAGS@ \
-                                $(top_builddir)/libmysql/libmysqlclient.la
+                                $(top_builddir)/libmysql/.libs/libmysqlclient.a
 
 noinst_HEADERS = sql_string.h completion_hash.h my_readline.h \
 				client_priv.h