From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-445267-garchives=archives.gentoo.org@lists.gentoo.org>) id 1SEOz1-0005EW-Lo for garchives@archives.gentoo.org; Sun, 01 Apr 2012 17:54:32 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C77B1E07AB; Sun, 1 Apr 2012 17:54:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5F747E07AB for <gentoo-commits@lists.gentoo.org>; Sun, 1 Apr 2012 17:54:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8348C1B4013 for <gentoo-commits@lists.gentoo.org>; Sun, 1 Apr 2012 17:54:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4C035E5403 for <gentoo-commits@lists.gentoo.org>; Sun, 1 Apr 2012 17:54:22 +0000 (UTC) From: "Robin H. Johnson" <robbat2@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org> Message-ID: <1333302806.5516c7c35d43b1813e3ac90f8339135840057935.robbat2@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 00000_index.txt 02040_all_embedded-library-shared-5.0.96.patch X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 5516c7c35d43b1813e3ac90f8339135840057935 X-VCS-Branch: master Date: Sun, 1 Apr 2012 17:54:22 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: b987c35e-9934-4bb5-9884-613dcf52ca50 X-Archives-Hash: c45fc3687cf58b647eb1552c599da155 commit: 5516c7c35d43b1813e3ac90f8339135840057935 Author: Robin H. Johnson <robbat2 <AT> orbis-terrarum <DOT> net> AuthorDate: Sun Apr 1 17:53:26 2012 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Sun Apr 1 17:53:26 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql-extras.= git;a=3Dcommit;h=3D5516c7c3 new spin of the shared lib patch. --- 00000_index.txt | 7 +- 02040_all_embedded-library-shared-5.0.96.patch | 1524 ++++++++++++++++++= ++++++ 2 files changed, 1530 insertions(+), 1 deletions(-) diff --git a/00000_index.txt b/00000_index.txt index 8c38d58..163c5a2 100644 --- a/00000_index.txt +++ b/00000_index.txt @@ -281,7 +281,12 @@ @@ Take libmysqld to be a proper shared library. =20 @patch 02040_all_embedded-library-shared-5.0.92.patch -@ver 5.0.92.00 to 5.00.99.99 +@ver 5.0.92.00 to 5.00.95.99 +@pn mysql +@@ Take libmysqld to be a proper shared library. + +@patch 02040_all_embedded-library-shared-5.0.96.patch +@ver 5.0.96.00 to 5.00.99.99 @pn mysql @@ Take libmysqld to be a proper shared library. =20 diff --git a/02040_all_embedded-library-shared-5.0.96.patch b/02040_all_e= mbedded-library-shared-5.0.96.patch new file mode 100644 index 0000000..f8e4b54 --- /dev/null +++ b/02040_all_embedded-library-shared-5.0.96.patch @@ -0,0 +1,1524 @@ +Convert all of the static libraries for the embedded libmysqld to build = as +shared. + +This enables amarok's mysql extension to properly build as a shared obje= ct, +without statically including libmysqld or nor forcing libmysqld to be bu= ilt +with -fPIC. + +Thanks to <pageexec@freemail.hu> for the @plt fixes. +Thanks to Diego Elio Petten=C3=B2 <flameeyes@gentoo.org> for all the ext= ensive build +system help with libtool conversions. + +Gentoo-Bug: 238487 +Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=3D238487 +MySQL-Bug-URL: http://bugs.mysql.com/bug.php?id=3D39288 +MySQL-Bug: 39288 +MySQL-Lists-URL: http://lists.mysql.com/internals/35947 +X-Patch-URL: http://bugs.gentoo.org/attachment.cgi?id=3D188019&action=3D= view +Signed-off-by: Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/client/Mak= efile.am mysql/client/Makefile.am +--- mysql.orig/client/Makefile.am 2012-03-02 06:04:08.000000000 -0800 ++++ mysql/client/Makefile.am 2012-04-01 10:47:50.422941695 -0700 +@@ -39,7 +39,7 @@ + $(top_srcdir)/mysys/my_sync.c \ + $(top_srcdir)/mysys/my_mkdir.c +=20 +-mysqltest_LDADD =3D $(top_builddir)/regex/libregex.a $(LDADD) ++mysqltest_LDADD =3D $(top_builddir)/regex/libregex.la $(LDADD) + mysqlbinlog_SOURCES =3D mysqlbinlog.cc \ + $(top_srcdir)/mysys/mf_tempdir.c \ + $(top_srcdir)/mysys/my_new.cc +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/config/ac-= macros/ha_innodb.m4 mysql/config/ac-macros/ha_innodb.m4 +--- mysql.orig/config/ac-macros/ha_innodb.m4 2012-03-02 06:04:11.0000000= 00 -0800 ++++ mysql/config/ac-macros/ha_innodb.m4 2012-04-01 10:47:50.422941695 -0= 700 +@@ -25,40 +25,35 @@ + dnl Some libs are listed several times, in order for gcc to sort out + dnl circular references. + innodb_libs=3D"\ +- \$(top_builddir)/innobase/usr/libusr.a\ +- \$(top_builddir)/innobase/srv/libsrv.a\ +- \$(top_builddir)/innobase/dict/libdict.a\ +- \$(top_builddir)/innobase/que/libque.a\ +- \$(top_builddir)/innobase/srv/libsrv.a\ +- \$(top_builddir)/innobase/ibuf/libibuf.a\ +- \$(top_builddir)/innobase/row/librow.a\ +- \$(top_builddir)/innobase/pars/libpars.a\ +- \$(top_builddir)/innobase/btr/libbtr.a\ +- \$(top_builddir)/innobase/trx/libtrx.a\ +- \$(top_builddir)/innobase/read/libread.a\ +- \$(top_builddir)/innobase/usr/libusr.a\ +- \$(top_builddir)/innobase/buf/libbuf.a\ +- \$(top_builddir)/innobase/ibuf/libibuf.a\ +- \$(top_builddir)/innobase/eval/libeval.a\ +- \$(top_builddir)/innobase/log/liblog.a\ +- \$(top_builddir)/innobase/fsp/libfsp.a\ +- \$(top_builddir)/innobase/fut/libfut.a\ +- \$(top_builddir)/innobase/fil/libfil.a\ +- \$(top_builddir)/innobase/lock/liblock.a\ +- \$(top_builddir)/innobase/mtr/libmtr.a\ +- \$(top_builddir)/innobase/page/libpage.a\ +- \$(top_builddir)/innobase/rem/librem.a\ +- \$(top_builddir)/innobase/thr/libthr.a\ +- \$(top_builddir)/innobase/sync/libsync.a\ +- \$(top_builddir)/innobase/data/libdata.a\ +- \$(top_builddir)/innobase/mach/libmach.a\ +- \$(top_builddir)/innobase/ha/libha.a\ +- \$(top_builddir)/innobase/dyn/libdyn.a\ +- \$(top_builddir)/innobase/mem/libmem.a\ +- \$(top_builddir)/innobase/sync/libsync.a\ +- \$(top_builddir)/innobase/ut/libut.a\ +- \$(top_builddir)/innobase/os/libos.a\ +- \$(top_builddir)/innobase/ut/libut.a" ++ \$(top_builddir)/innobase/usr/libusr.la\ ++ \$(top_builddir)/innobase/srv/libsrv.la\ ++ \$(top_builddir)/innobase/dict/libdict.la\ ++ \$(top_builddir)/innobase/que/libque.la\ ++ \$(top_builddir)/innobase/ibuf/libibuf.la\ ++ \$(top_builddir)/innobase/row/librow.la\ ++ \$(top_builddir)/innobase/pars/libpars.la\ ++ \$(top_builddir)/innobase/btr/libbtr.la\ ++ \$(top_builddir)/innobase/trx/libtrx.la\ ++ \$(top_builddir)/innobase/read/libread.la\ ++ \$(top_builddir)/innobase/buf/libbuf.la\ ++ \$(top_builddir)/innobase/eval/libeval.la\ ++ \$(top_builddir)/innobase/log/liblog.la\ ++ \$(top_builddir)/innobase/fsp/libfsp.la\ ++ \$(top_builddir)/innobase/fut/libfut.la\ ++ \$(top_builddir)/innobase/fil/libfil.la\ ++ \$(top_builddir)/innobase/lock/liblock.la\ ++ \$(top_builddir)/innobase/mtr/libmtr.la\ ++ \$(top_builddir)/innobase/page/libpage.la\ ++ \$(top_builddir)/innobase/rem/librem.la\ ++ \$(top_builddir)/innobase/thr/libthr.la\ ++ \$(top_builddir)/innobase/sync/libsync.la\ ++ \$(top_builddir)/innobase/data/libdata.la\ ++ \$(top_builddir)/innobase/mach/libmach.la\ ++ \$(top_builddir)/innobase/ha/libha.la\ ++ \$(top_builddir)/innobase/dyn/libdyn.la\ ++ \$(top_builddir)/innobase/mem/libmem.la\ ++ \$(top_builddir)/innobase/ut/libut.la\ ++ \$(top_builddir)/innobase/os/libos.la" +=20 + AC_CHECK_LIB(rt, aio_read, [innodb_system_libs=3D"-lrt"]) + ;; +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/configure.= in mysql/configure.in +--- mysql.orig/configure.in 2012-03-02 06:04:07.000000000 -0800 ++++ mysql/configure.in 2012-04-01 10:47:50.423941710 -0700 +@@ -256,7 +256,7 @@ + fi +=20 + # Still need ranlib for readline; local static use only so no libtool. +-AC_PROG_RANLIB ++#AC_PROG_RANLIB + # We use libtool + #AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL +@@ -577,6 +577,9 @@ + # We need an ANSI C compiler + AM_PROG_CC_STDC +=20 ++# Testing as sugggested by Diego ++AM_PROG_CC_C_O ++ + # We need an assembler, too + AM_PROG_AS + CCASFLAGS=3D"$CCASFLAGS $ASFLAGS" +@@ -2777,9 +2780,9 @@ +=20 + if test "$THREAD_SAFE_CLIENT" =3D "no" + then +- sql_client_dirs=3D"strings regex mysys dbug extra libmysql client" ++ sql_client_dirs=3D"strings regex dbug mysys extra libmysql client" + else +- sql_client_dirs=3D"strings regex mysys dbug extra libmysql libmysql_r= client" ++ sql_client_dirs=3D"strings regex dbug mysys extra libmysql libmysql_r= client" + linked_client_targets=3D"$linked_client_targets linked_libmysql_r_sou= rces" + AC_CONFIG_FILES(libmysql_r/Makefile) + AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe= ]) +@@ -2808,13 +2811,11 @@ + export CC CXX CFLAGS CXXFLAGS LD LDFLAGS AR + ac_configure_args=3D"$ac_configure_args CFLAGS=3D'$CFLAGS' CXXFLAGS=3D'= $CXXFLAGS'" +=20 ++AM_CONDITIONAL([NEED_THREADS], [test x"$with_server" !=3D xno -o x"$THR= EAD_SAFE_CLIENT" !=3D xno]) + if test "$with_server" !=3D "no" -o "$THREAD_SAFE_CLIENT" !=3D "no" + then + AC_DEFINE([THREAD], [1], + [Define if you want to have threaded code. This may be unde= f on client code]) +- # Avoid _PROGRAMS names +- THREAD_LOBJECTS=3D"thr_alarm.o thr_lock.o thr_mutex.o thr_rwlock.o my= _pthread.o my_thr_init.o mf_keycache.o" +- AC_SUBST(THREAD_LOBJECTS) + fi +=20 + if test "$with_server" =3D "no" +@@ -2822,7 +2823,7 @@ + AM_CONDITIONAL([BUILD_INNODB_TOOLS], [false]) + else + server_scripts=3D"mysqld_safe mysql_install_db" +- sql_server_dirs=3D"strings mysys dbug extra regex" ++ sql_server_dirs=3D"strings dbug mysys extra regex" +=20 +=20 + # +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/dbug/Makef= ile.am mysql/dbug/Makefile.am +--- mysql.orig/dbug/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/dbug/Makefile.am 2012-04-01 10:47:50.423941710 -0700 +@@ -16,10 +16,10 @@ + # MA 02111-1307, USA +=20 + INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/inc= lude +-LDADD =3D libdbug.a ../mysys/libmysys.a ../strings/libm= ystrings.a +-pkglib_LIBRARIES =3D libdbug.a ++LDADD =3D ../mysys/libmysys.la ../strings/libmystrings.= la ++noinst_LTLIBRARIES =3D libdbug.la + noinst_HEADERS =3D dbug_long.h +-libdbug_a_SOURCES =3D dbug.c sanity.c ++libdbug_la_SOURCES =3D dbug.c sanity.c + EXTRA_DIST =3D example1.c example2.c example3.c \ + user.r monty.doc readme.prof dbug_add_tags.pl \ + my_main.c main.c factorial.c dbug_analyze.c \ +@@ -31,11 +31,11 @@ +=20 +=20 + # Must be linked with libs that are not compiled yet +-noinst_PROGRAMS =3D factorial dbug_analyze ++EXTRA_PROGRAMS =3D factorial dbug_analyze + factorial_SOURCES =3D my_main.c factorial.c + dbug_analyze_SOURCES =3D dbug_analyze.c +=20 +-all: user.t user.ps ++check-local: user.t user.ps +=20 + user.t: user.r $(NROFF_INC) + -nroff -mm user.r > $@ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/extra/Make= file.am mysql/extra/Makefile.am +--- mysql.orig/extra/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/extra/Makefile.am 2012-04-01 10:47:50.424941725 -0700 +@@ -15,8 +15,7 @@ +=20 + INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include \ + @ndbcluster_includes@ -I$(top_srcdir)/sql +-LDADD =3D @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ +- ../dbug/libdbug.a ../strings/libmystrings.a \ ++LDADD =3D @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \ + $(ZLIB_LIBS) + BUILT_SOURCES=3D $(top_builddir)/include/mysqld_error.h \ + $(top_builddir)/include/sql_state.h \ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/heap/Makef= ile.am mysql/heap/Makefile.am +--- mysql.orig/heap/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/heap/Makefile.am 2012-04-01 10:47:50.424941725 -0700 +@@ -14,14 +14,13 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 = USA +=20 + INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include=20 +-LDADD =3D libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \ +- ../strings/libmystrings.a +-pkglib_LIBRARIES =3D libheap.a ++LDADD =3D libheap.la ../mysys/libmysys.la ++pkglib_LTLIBRARIES =3D libheap.la + noinst_PROGRAMS =3D hp_test1 hp_test2 + hp_test1_LDFLAGS =3D @NOINST_LDFLAGS@ + hp_test2_LDFLAGS =3D @NOINST_LDFLAGS@ + noinst_HEADERS =3D heapdef.h +-libheap_a_SOURCES =3D hp_open.c hp_extra.c hp_close.c hp_panic.c hp_inf= o.c \ ++libheap_la_SOURCES =3D hp_open.c hp_extra.c hp_close.c hp_panic.c hp_in= fo.c \ + hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \ + hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \ + hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/b= tr/Makefile.am mysql/innobase/btr/Makefile.am +--- mysql.orig/innobase/btr/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/btr/Makefile.am 2012-04-01 10:47:50.424941725 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libbtr.a ++noinst_LTLIBRARIES =3D libbtr.la +=20 +-libbtr_a_SOURCES =3D btr0btr.c btr0cur.c btr0pcur.c btr0sea.c ++libbtr_la_SOURCES =3D btr0btr.c btr0cur.c btr0pcur.c btr0sea.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/b= uf/Makefile.am mysql/innobase/buf/Makefile.am +--- mysql.orig/innobase/buf/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/buf/Makefile.am 2012-04-01 10:47:50.424941725 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libbuf.a ++noinst_LTLIBRARIES =3D libbuf.la +=20 +-libbuf_a_SOURCES =3D buf0buf.c buf0flu.c buf0lru.c buf0rea.c ++libbuf_la_SOURCES =3D buf0buf.c buf0flu.c buf0lru.c buf0rea.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/c= onfigure.in mysql/innobase/configure.in +--- mysql.orig/innobase/configure.in 2012-03-02 06:04:10.000000000 -0800 ++++ mysql/innobase/configure.in 2012-04-01 10:47:50.425941740 -0700 +@@ -32,7 +32,7 @@ + CXXFLAGS=3D"$CXXFLAGS " +=20 + AC_PROG_CC +-AC_PROG_RANLIB ++#AC_PROG_RANLIB + AC_PROG_INSTALL + AC_PROG_LIBTOOL + AC_CHECK_HEADERS(aio.h sched.h) +@@ -126,14 +126,4 @@ + fi + AC_SUBST(ARFLAGS) +=20 +-AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl +- buf/Makefile data/Makefile dnl +- dict/Makefile dyn/Makefile dnl +- eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl +- ha/Makefile ibuf/Makefile include/Makefile dnl +- lock/Makefile log/Makefile dnl +- mach/Makefile mem/Makefile mtr/Makefile dnl +- page/Makefile pars/Makefile que/Makefile dnl +- read/Makefile rem/Makefile row/Makefile dnl +- srv/Makefile sync/Makefile thr/Makefile trx/Makefile dnl +- usr/Makefile) ++AC_OUTPUT(Makefile) +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/d= ata/Makefile.am mysql/innobase/data/Makefile.am +--- mysql.orig/innobase/data/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/data/Makefile.am 2012-04-01 10:47:50.425941740 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libdata.a ++noinst_LTLIBRARIES =3D libdata.la +=20 +-libdata_a_SOURCES =3D data0data.c data0type.c ++libdata_la_SOURCES =3D data0data.c data0type.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/d= ict/Makefile.am mysql/innobase/dict/Makefile.am +--- mysql.orig/innobase/dict/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/dict/Makefile.am 2012-04-01 10:47:50.425941740 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libdict.a ++noinst_LTLIBRARIES =3D libdict.la +=20 +-libdict_a_SOURCES =3D dict0boot.c dict0crea.c dict0dict.c dict0load.c\ ++libdict_la_SOURCES =3D dict0boot.c dict0crea.c dict0dict.c dict0load.c\ + dict0mem.c +=20 + EXTRA_PROGRAMS =3D=09 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/d= yn/Makefile.am mysql/innobase/dyn/Makefile.am +--- mysql.orig/innobase/dyn/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/dyn/Makefile.am 2012-04-01 10:47:50.425941740 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libdyn.a ++noinst_LTLIBRARIES =3D libdyn.la +=20 +-libdyn_a_SOURCES =3D dyn0dyn.c ++libdyn_la_SOURCES =3D dyn0dyn.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/e= val/Makefile.am mysql/innobase/eval/Makefile.am +--- mysql.orig/innobase/eval/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/eval/Makefile.am 2012-04-01 10:47:50.425941740 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libeval.a ++noinst_LTLIBRARIES =3D libeval.la +=20 +-libeval_a_SOURCES =3D eval0eval.c eval0proc.c ++libeval_la_SOURCES =3D eval0eval.c eval0proc.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/f= il/Makefile.am mysql/innobase/fil/Makefile.am +--- mysql.orig/innobase/fil/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/fil/Makefile.am 2012-04-01 10:47:50.426941755 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libfil.a ++noinst_LTLIBRARIES =3D libfil.la +=20 +-libfil_a_SOURCES =3D fil0fil.c ++libfil_la_SOURCES =3D fil0fil.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/f= sp/Makefile.am mysql/innobase/fsp/Makefile.am +--- mysql.orig/innobase/fsp/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/fsp/Makefile.am 2012-04-01 10:47:50.426941755 -0700 +@@ -16,9 +16,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libfsp.a ++noinst_LTLIBRARIES =3D libfsp.la +=20 +-libfsp_a_SOURCES =3D fsp0fsp.c ++libfsp_la_SOURCES =3D fsp0fsp.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/f= ut/Makefile.am mysql/innobase/fut/Makefile.am +--- mysql.orig/innobase/fut/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/fut/Makefile.am 2012-04-01 10:47:50.426941755 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libfut.a ++noinst_LTLIBRARIES =3D libfut.la +=20 +-libfut_a_SOURCES =3D fut0fut.c fut0lst.c ++libfut_la_SOURCES =3D fut0fut.c fut0lst.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/h= a/Makefile.am mysql/innobase/ha/Makefile.am +--- mysql.orig/innobase/ha/Makefile.am 2012-03-02 06:04:12.000000000 -08= 00 ++++ mysql/innobase/ha/Makefile.am 2012-04-01 10:47:50.426941755 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libha.a ++noinst_LTLIBRARIES =3D libha.la +=20 +-libha_a_SOURCES =3D ha0ha.c hash0hash.c ++libha_la_SOURCES =3D ha0ha.c hash0hash.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/i= buf/Makefile.am mysql/innobase/ibuf/Makefile.am +--- mysql.orig/innobase/ibuf/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/ibuf/Makefile.am 2012-04-01 10:47:50.427941770 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libibuf.a ++noinst_LTLIBRARIES =3D libibuf.la +=20 +-libibuf_a_SOURCES =3D ibuf0ibuf.c ++libibuf_la_SOURCES =3D ibuf0ibuf.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/l= ock/Makefile.am mysql/innobase/lock/Makefile.am +--- mysql.orig/innobase/lock/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/lock/Makefile.am 2012-04-01 10:47:50.427941770 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D liblock.a ++noinst_LTLIBRARIES =3D liblock.la +=20 +-liblock_a_SOURCES =3D lock0lock.c ++liblock_la_SOURCES =3D lock0lock.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/l= og/Makefile.am mysql/innobase/log/Makefile.am +--- mysql.orig/innobase/log/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/log/Makefile.am 2012-04-01 10:47:50.427941770 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D liblog.a ++noinst_LTLIBRARIES =3D liblog.la +=20 +-liblog_a_SOURCES =3D log0log.c log0recv.c ++liblog_la_SOURCES =3D log0log.c log0recv.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/m= ach/Makefile.am mysql/innobase/mach/Makefile.am +--- mysql.orig/innobase/mach/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/mach/Makefile.am 2012-04-01 10:47:50.427941770 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libmach.a ++noinst_LTLIBRARIES =3D libmach.la +=20 +-libmach_a_SOURCES =3D mach0data.c ++libmach_la_SOURCES =3D mach0data.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/M= akefile.am mysql/innobase/Makefile.am +--- mysql.orig/innobase/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/innobase/Makefile.am 2012-04-01 10:47:50.428941784 -0700 +@@ -15,14 +15,35 @@ +=20 + # Process this file with automake to create Makefile.in +=20 +-AUTOMAKE_OPTIONS =3D foreign +-TAR =3D gtar +- + noinst_HEADERS =3D ib_config.h +=20 +-SUBDIRS =3D os ut btr buf data dict dyn eval fil fsp fut \ +- ha ibuf include lock log mach mem mtr page \ +- pars que read rem row srv sync thr trx usr ++INCLUDES =3D -I$(srcdir)/include -I$(srcdir)/../include ++ ++pkglib_LTLIBRARIES =3D libinnobase.la ++ ++libinnobase_la_SOURCES =3D btr/btr0btr.c btr/btr0cur.c \ ++ btr/btr0pcur.c btr/btr0sea.c buf/buf0buf.c buf/buf0flu.c \ ++ buf/buf0lru.c buf/buf0rea.c data/data0data.c data/data0type.c \ ++ dict/dict0boot.c dict/dict0crea.c dict/dict0dict.c \ ++ dict/dict0load.c dict/dict0mem.c dyn/dyn0dyn.c \ ++ eval/eval0eval.c eval/eval0proc.c fil/fil0fil.c \ ++ fsp/fsp0fsp.c fut/fut0fut.c fut/fut0lst.c ha/ha0ha.c \ ++ ha/hash0hash.c ibuf/ibuf0ibuf.c lock/lock0lock.c \ ++ log/log0log.c log/log0recv.c mach/mach0data.c \ ++ mem/mem0mem.c mem/mem0pool.c mtr/mtr0mtr.c mtr/mtr0log.c \ ++ os/os0proc.c os/os0sync.c os/os0thread.c os/os0file.c \ ++ page/page0page.c page/page0cur.c pars/pars0grm.c pars/lexyy.c \ ++ pars/pars0opt.c pars/pars0pars.c pars/pars0sym.c \ ++ que/que0que.c read/read0read.c rem/rem0rec.c rem/rem0cmp.c \ ++ row/row0ins.c row/row0mysql.c row/row0purge.c row/row0row.c \ ++ row/row0sel.c row/row0uins.c row/row0umod.c row/row0undo.c \ ++ row/row0upd.c row/row0vers.c srv/srv0srv.c srv/srv0que.c \ ++ srv/srv0start.c sync/sync0arr.c sync/sync0rw.c \ ++ sync/sync0sync.c thr/thr0loc.c trx/trx0purge.c \ ++ trx/trx0rec.c trx/trx0roll.c trx/trx0rseg.c trx/trx0sys.c \ ++ trx/trx0trx.c trx/trx0undo.c usr/usr0sess.c ut/ut0byte.c \ ++ ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c ++ + EXTRA_DIST =3D CMakeLists.txt +=20 + # Don't update the files from bitkeeper +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/m= em/Makefile.am mysql/innobase/mem/Makefile.am +--- mysql.orig/innobase/mem/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/mem/Makefile.am 2012-04-01 10:47:50.428941784 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libmem.a ++noinst_LTLIBRARIES =3D libmem.la +=20 +-libmem_a_SOURCES =3D mem0mem.c mem0pool.c ++libmem_la_SOURCES =3D mem0mem.c mem0pool.c +=20 + EXTRA_DIST =3D mem0dbg.c +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/m= tr/Makefile.am mysql/innobase/mtr/Makefile.am +--- mysql.orig/innobase/mtr/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/mtr/Makefile.am 2012-04-01 10:47:50.428941784 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libmtr.a ++noinst_LTLIBRARIES =3D libmtr.la +=20 +-libmtr_a_SOURCES =3D mtr0mtr.c mtr0log.c ++libmtr_la_SOURCES =3D mtr0mtr.c mtr0log.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/o= s/Makefile.am mysql/innobase/os/Makefile.am +--- mysql.orig/innobase/os/Makefile.am 2012-03-02 06:04:12.000000000 -08= 00 ++++ mysql/innobase/os/Makefile.am 2012-04-01 10:47:50.428941784 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libos.a ++noinst_LTLIBRARIES =3D libos.la +=20 +-libos_a_SOURCES =3D os0proc.c os0sync.c os0thread.c os0file.c ++libos_la_SOURCES =3D os0proc.c os0sync.c os0thread.c os0file.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/p= age/Makefile.am mysql/innobase/page/Makefile.am +--- mysql.orig/innobase/page/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/page/Makefile.am 2012-04-01 10:47:50.429941798 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libpage.a ++noinst_LTLIBRARIES =3D libpage.la +=20 +-libpage_a_SOURCES =3D page0page.c page0cur.c ++libpage_la_SOURCES =3D page0page.c page0cur.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/p= ars/Makefile.am mysql/innobase/pars/Makefile.am +--- mysql.orig/innobase/pars/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/pars/Makefile.am 2012-04-01 10:47:50.433941856 -0700 +@@ -15,11 +15,11 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libpars.a ++noinst_LTLIBRARIES =3D libpars.la +=20 + noinst_HEADERS =3D pars0grm.h +=20 +-libpars_a_SOURCES =3D pars0grm.c lexyy.c pars0opt.c pars0pars.c pars0sy= m.c ++libpars_la_SOURCES =3D pars0grm.c lexyy.c pars0opt.c pars0pars.c pars0s= ym.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/q= ue/Makefile.am mysql/innobase/que/Makefile.am +--- mysql.orig/innobase/que/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/que/Makefile.am 2012-04-01 10:47:50.433941856 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libque.a ++noinst_LTLIBRARIES =3D libque.la +=20 +-libque_a_SOURCES =3D que0que.c ++libque_la_SOURCES =3D que0que.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/r= ead/Makefile.am mysql/innobase/read/Makefile.am +--- mysql.orig/innobase/read/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/read/Makefile.am 2012-04-01 10:47:50.433941856 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libread.a ++noinst_LTLIBRARIES =3D libread.la +=20 +-libread_a_SOURCES =3D read0read.c ++libread_la_SOURCES =3D read0read.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/r= em/Makefile.am mysql/innobase/rem/Makefile.am +--- mysql.orig/innobase/rem/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/rem/Makefile.am 2012-04-01 10:47:50.433941856 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D librem.a ++noinst_LTLIBRARIES =3D librem.la +=20 +-librem_a_SOURCES =3D rem0rec.c rem0cmp.c ++librem_la_SOURCES =3D rem0rec.c rem0cmp.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/r= ow/Makefile.am mysql/innobase/row/Makefile.am +--- mysql.orig/innobase/row/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/row/Makefile.am 2012-04-01 10:47:50.434941870 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D librow.a ++noinst_LTLIBRARIES =3D librow.la +=20 +-librow_a_SOURCES =3D row0ins.c row0mysql.c row0purge.c row0row.c row0se= l.c\ ++librow_la_SOURCES =3D row0ins.c row0mysql.c row0purge.c row0row.c row0s= el.c\ + row0uins.c row0umod.c row0undo.c row0upd.c row0vers.c +=20 + EXTRA_PROGRAMS =3D=09 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/s= rv/Makefile.am mysql/innobase/srv/Makefile.am +--- mysql.orig/innobase/srv/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/srv/Makefile.am 2012-04-01 10:47:50.434941870 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libsrv.a ++noinst_LTLIBRARIES =3D libsrv.la +=20 +-libsrv_a_SOURCES =3D srv0srv.c srv0que.c srv0start.c ++libsrv_la_SOURCES =3D srv0srv.c srv0que.c srv0start.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/s= ync/Makefile.am mysql/innobase/sync/Makefile.am +--- mysql.orig/innobase/sync/Makefile.am 2012-03-02 06:04:12.000000000 -= 0800 ++++ mysql/innobase/sync/Makefile.am 2012-04-01 10:47:50.434941870 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libsync.a ++noinst_LTLIBRARIES =3D libsync.la +=20 +-libsync_a_SOURCES =3D sync0arr.c sync0rw.c sync0sync.c ++libsync_la_SOURCES =3D sync0arr.c sync0rw.c sync0sync.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/t= hr/Makefile.am mysql/innobase/thr/Makefile.am +--- mysql.orig/innobase/thr/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/thr/Makefile.am 2012-04-01 10:47:50.434941870 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libthr.a ++noinst_LTLIBRARIES =3D libthr.la +=20 +-libthr_a_SOURCES =3D thr0loc.c ++libthr_la_SOURCES =3D thr0loc.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/t= rx/Makefile.am mysql/innobase/trx/Makefile.am +--- mysql.orig/innobase/trx/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/trx/Makefile.am 2012-04-01 10:47:50.435941885 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libtrx.a ++noinst_LTLIBRARIES =3D libtrx.la +=20 +-libtrx_a_SOURCES =3D trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\ ++libtrx_la_SOURCES =3D trx0purge.c trx0rec.c trx0roll.c trx0rseg.c\ + trx0sys.c trx0trx.c trx0undo.c +=20 + EXTRA_PROGRAMS =3D=09 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/u= sr/Makefile.am mysql/innobase/usr/Makefile.am +--- mysql.orig/innobase/usr/Makefile.am 2012-03-02 06:04:12.000000000 -0= 800 ++++ mysql/innobase/usr/Makefile.am 2012-04-01 10:47:50.435941885 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libusr.a ++noinst_LTLIBRARIES =3D libusr.la +=20 +-libusr_a_SOURCES =3D usr0sess.c ++libusr_la_SOURCES =3D usr0sess.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/innobase/u= t/Makefile.am mysql/innobase/ut/Makefile.am +--- mysql.orig/innobase/ut/Makefile.am 2012-03-02 06:04:12.000000000 -08= 00 ++++ mysql/innobase/ut/Makefile.am 2012-04-01 10:47:50.435941885 -0700 +@@ -15,9 +15,9 @@ +=20 + include ../include/Makefile.i +=20 +-noinst_LIBRARIES =3D libut.a ++noinst_LTLIBRARIES =3D libut.la +=20 +-libut_a_SOURCES =3D ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c ++libut_la_SOURCES =3D ut0byte.c ut0dbg.c ut0mem.c ut0rnd.c ut0ut.c +=20 + EXTRA_PROGRAMS =3D=09 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/libmysql/M= akefile.am mysql/libmysql/Makefile.am +--- mysql.orig/libmysql/Makefile.am 2012-03-02 06:04:07.000000000 -0800 ++++ mysql/libmysql/Makefile.am 2012-04-01 10:47:50.435941885 -0700 +@@ -105,8 +105,8 @@ + echo "# This file is autogenerated from Makefile.am" >> $$dir/Makefile= ; \ + echo 'CFLAGS=3D -I. -DUNDEF_THREADS_HACK' >>$$dir/Makefile; \ + echo "obj=3D$$objs" >>$$dir/Makefile; \ +- echo 'all: libmysql.a' >>$$dir/Makefile; \ +- echo 'libmysql.a: $$(obj)' >>$$dir/Makefile; \ ++ echo 'all: libmysql.la' >>$$dir/Makefile; \ ++ echo 'libmysql.la: $$(obj)' >>$$dir/Makefile; \ + echo ' $$(AR) r $$@ $$?' >>$$dir/Makefile; \ + gtar cvzf $$dir.tar.gz $$dir; \ + cd $$dir; gmake +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/libmysqld/= examples/Makefile.am mysql/libmysqld/examples/Makefile.am +--- mysql.orig/libmysqld/examples/Makefile.am 2012-03-02 06:04:12.000000= 000 -0800 ++++ mysql/libmysqld/examples/Makefile.am 2012-04-01 10:47:50.436941900 -= 0700 +@@ -35,12 +35,12 @@ + -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ + $(openssl_includes) + LIBS =3D @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs) +-LDADD =3D @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @= LIBDL@ $(CXXLDFLAGS) \ ++LDADD =3D @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @innodb_system_libs@ = @LIBDL@ $(CXXLDFLAGS) \ + @NDB_SCI_LIBS@ +=20 + mysqltest_embedded_LINK =3D $(CXXLINK) + mysqltest_embedded_SOURCES =3D mysqltest.c +-mysqltest_embedded_LDADD =3D $(LDADD) $(top_builddir)/regex/libregex.a ++mysqltest_embedded_LDADD =3D $(LDADD) $(top_builddir)/regex/libregex.la +=20 + mysql_SOURCES =3D mysql.cc readline.cc completion_hash.cc \ + my_readline.h sql_string.h completion_hash.h +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/libmysqld/= Makefile.am mysql/libmysqld/Makefile.am +--- mysql.orig/libmysqld/Makefile.am 2012-03-02 06:04:08.000000000 -0800 ++++ mysql/libmysqld/Makefile.am 2012-04-01 10:47:50.436941900 -0700 +@@ -33,10 +33,10 @@ + -I$(top_srcdir)/regex \ + $(openssl_includes) @ZLIB_INCLUDES@ +=20 +-noinst_LIBRARIES =3D libmysqld_int.a +-pkglib_LIBRARIES =3D libmysqld.a ++noinst_LTLIBRARIES =3D libmysqld_int.la ++pkglib_LTLIBRARIES =3D libmysqld.la + SUBDIRS =3D . examples +-libmysqld_sources=3D libmysqld.c lib_sql.cc emb_qcache.cc ++#libmysqld_sources=3D libmysqld.c lib_sql.cc emb_qcache.cc + libmysqlsources =3D errmsg.c get_password.c libmysql.c client.c pack.c = \ + my_time.c + sqlexamplessources =3D ha_example.cc ha_tina.cc +@@ -68,50 +68,22 @@ + parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \ + ha_blackhole.cc ha_archive.cc my_user.c +=20 +-libmysqld_int_a_SOURCES=3D $(libmysqld_sources) $(libmysqlsources) $(sq= lsources) $(sqlexamplessources) +-libmysqld_a_SOURCES=3D ++libmysqld_int_la_SOURCES=3D $(libmysqld_sources) $(libmysqlsources) $(s= qlsources) $(sqlexamplessources) ++#libmysqld_la_SOURCES=3D ++libmysqld_la_SOURCES=3D libmysqld.c lib_sql.cc emb_qcache.cc +=20 + # automake misses these + sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy +=20 +-# The following libraries should be included in libmysqld.a +-INC_LIB=3D $(top_builddir)/regex/libregex.a \ +- $(top_builddir)/myisam/libmyisam.a \ +- $(top_builddir)/myisammrg/libmyisammrg.a \ +- $(top_builddir)/heap/libheap.a \ +- @innodb_libs@ @bdb_libs_with_path@ \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/vio/libvio.a @NDB_SCI_LIBS@ +- +- +-# +-# To make it easy for the end user to use the embedded library we +-# generate a total libmysqld.a from all library files, +- +-# note - InnoDB libraries have circular dependencies, so in INC_LIB +-# few libraries are present two times. Metrowerks linker doesn't like +-# it at all. Traditional ar has no problems with it, but still there's = no +-# need to add the same file twice to the library, so 'sort -u' save us +-# some time and spares unnecessary work. +- +-libmysqld.a: libmysqld_int.a $(INC_LIB) +-if DARWIN_MWCC +- mwld -lib -o $@ libmysqld_int.a `echo $(INC_LIB) | sort -u` +-else +- -rm -f libmysqld.a +- if test "$(host_os)" =3D "netware" ; \ +- then \ +- $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \ +- else \ +- for arc in ./libmysqld_int.a $(INC_LIB); do \ +- arpath=3D`echo $$arc|sed 's|[^/]*$$||'`; \ +- $(AR) t $$arc|sed "s|^|$$arpath|"; \ +- done | sort -u | xargs $(AR) cq libmysqld.a ; \ +- $(RANLIB) libmysqld.a ; \ +- fi +-endif ++# The following libraries should be included in libmysqld.la ++libmysqld_la_LIBADD=3D $(top_builddir)/regex/libregex.la \ ++ $(top_builddir)/myisam/libmyisam.la \ ++ $(top_builddir)/myisammrg/libmyisammrg.la \ ++ $(top_builddir)/heap/libheap.la \ ++ $(top_builddir)/innobase/libinnobase.la @bdb_libs_with_path@ \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/vio/libvio.la @NDB_SCI_LIBS@ \ ++ libmysqld_int.la +=20 + ## XXX: any time the client interface changes, we'll need to bump + ## the version info for libmysqld; however, it's possible for the +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/myisam/Mak= efile.am mysql/myisam/Makefile.am +--- mysql.orig/myisam/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/myisam/Makefile.am 2012-04-01 10:47:50.436941900 -0700 +@@ -16,27 +16,27 @@ + EXTRA_DIST =3D mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt + pkgdata_DATA =3D mi_test_all mi_test_all.res +=20 +-INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include +-LDADD =3D @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ +-pkglib_LIBRARIES =3D libmyisam.a ++INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include \ ++ -I$(top_builddir)/sql -I$(top_srcdir)/sql ++LDADD =3D @CLIENT_EXTRA_LDFLAGS@ libmyisam.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(ZLIB_LIBS) ++noinst_LTLIBRARIES =3D libmyisam.la + bin_PROGRAMS =3D myisamchk myisamlog myisampack myisam_ftdump +-myisamchk_DEPENDENCIES=3D $(LIBRARIES) +-myisamlog_DEPENDENCIES=3D $(LIBRARIES) +-myisampack_DEPENDENCIES=3D$(LIBRARIES) ++myisamchk_DEPENDENCIES=3D $(LTLIBRARIES) ++myisamlog_DEPENDENCIES=3D $(LTLIBRARIES) ++myisampack_DEPENDENCIES=3D$(LTLIBRARIES) + noinst_PROGRAMS =3D mi_test1 mi_test2 mi_test3 rt_test sp_test #ft_test= 1 ft_eval + noinst_HEADERS =3D myisamdef.h rt_index.h rt_key.h rt_mbr.h sp_defs.h f= ulltext.h ftdefs.h ft_test1.h ft_eval.h +-mi_test1_DEPENDENCIES=3D $(LIBRARIES) +-mi_test2_DEPENDENCIES=3D $(LIBRARIES) +-mi_test3_DEPENDENCIES=3D $(LIBRARIES) +-#ft_test1_DEPENDENCIES=3D $(LIBRARIES) +-#ft_eval_DEPENDENCIES=3D $(LIBRARIES) +-myisam_ftdump_DEPENDENCIES=3D $(LIBRARIES) +-rt_test_DEPENDENCIES=3D $(LIBRARIES) +-sp_test_DEPENDENCIES=3D $(LIBRARIES) +-libmyisam_a_SOURCES =3D mi_open.c mi_extra.c mi_info.c mi_rkey.c \ ++mi_test1_DEPENDENCIES=3D $(LTLIBRARIES) ++mi_test2_DEPENDENCIES=3D $(LTLIBRARIES) ++mi_test3_DEPENDENCIES=3D $(LTLIBRARIES) ++#ft_test1_DEPENDENCIES=3D $(LTLIBRARIES) ++#ft_eval_DEPENDENCIES=3D $(LTLIBRARIES) ++myisam_ftdump_DEPENDENCIES=3D $(LTLIBRARIES) ++rt_test_DEPENDENCIES=3D $(LTLIBRARIES) ++sp_test_DEPENDENCIES=3D $(LTLIBRARIES) ++libmyisam_la_SOURCES =3D mi_open.c mi_extra.c mi_info.c mi_rkey.c \ + mi_rnext.c mi_rnext_same.c \ + mi_search.c mi_page.c mi_key.c mi_locking.c \ + mi_rrnd.c mi_scan.c mi_cache.c \ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/myisammrg/= Makefile.am mysql/myisammrg/Makefile.am +--- mysql.orig/myisammrg/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/myisammrg/Makefile.am 2012-04-01 10:47:50.437941915 -0700 +@@ -14,9 +14,9 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 = USA +=20 + INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include +-pkglib_LIBRARIES =3D libmyisammrg.a ++noinst_LTLIBRARIES =3D libmyisammrg.la + noinst_HEADERS =3D myrg_def.h +-libmyisammrg_a_SOURCES =3D myrg_open.c myrg_extra.c myrg_info.c myrg_lo= cking.c \ ++libmyisammrg_la_SOURCES =3D myrg_open.c myrg_extra.c myrg_info.c myrg_l= ocking.c \ + myrg_rrnd.c myrg_update.c myrg_delete.c myrg_rsame.c \ + myrg_panic.c myrg_close.c myrg_create.c myrg_static.c \ + myrg_rkey.c myrg_rfirst.c myrg_rlast.c myrg_rnext.c \ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/mysys/Make= file.am mysql/mysys/Makefile.am +--- mysql.orig/mysys/Makefile.am 2012-03-02 06:04:08.000000000 -0800 ++++ mysql/mysys/Makefile.am 2012-04-01 10:51:23.928012030 -0700 +@@ -18,11 +18,9 @@ + MYSQLBASEdir=3D $(prefix) + INCLUDES =3D @ZLIB_INCLUDES@ -I$(top_builddir)/include \ + -I$(top_srcdir)/include -I$(srcdir) +-pkglib_LIBRARIES =3D libmysys.a +-LDADD =3D libmysys.a ../dbug/libdbug.a \ +- ../strings/libmystrings.a ++pkglib_LTLIBRARIES =3D libmysys.la + noinst_HEADERS =3D mysys_priv.h my_static.h +-libmysys_a_SOURCES =3D my_init.c my_getwd.c mf_getdate.c my_mmap.c \ ++libmysys_la_SOURCES =3D my_init.c my_getwd.c mf_getdate.c my_mmap.c = \ + mf_path.c mf_loadpath.c my_file.c \ + my_open.c my_create.c my_dup.c my_seek.c my_read.c \ + my_pread.c my_write.c my_getpagesize.c \ +@@ -51,16 +49,21 @@ + charset.c charset-def.c my_bitmap.c my_bit.c md5.c \ + rijndael.c my_aes.c sha1.c \ + my_netware.c my_largepage.c \ +- my_memmem.c \ +- my_windac.c my_access.c base64.c my_libwrap.c ++ my_memmem.c my_windac.c my_access.c base64.c \ ++ my_libwrap.c ++libmysys_la_LIBADD =3D $(top_builddir)/dbug/libdbug.la $(top_builddir)/= strings/libmystrings.la \ ++ $(ZLIB_LIBS) ++if NEED_THREADS ++libmysys_la_SOURCES +=3D thr_alarm.c thr_lock.c thr_mutex.c thr_rwlock.= c my_pthread.c my_thr_init.c ++endif ++ + EXTRA_DIST =3D thr_alarm.c thr_lock.c my_pthread.c my_thr_init.c \ + thr_mutex.c thr_rwlock.c mf_soundex.c my_conio.c \ + my_wincond.c my_winthread.c CMakeLists.txt +-libmysys_a_LIBADD =3D @THREAD_LOBJECTS@ +-# test_dir_DEPENDENCIES=3D $(LIBRARIES) +-# testhash_DEPENDENCIES=3D $(LIBRARIES) +-# test_charset_DEPENDENCIES=3D $(LIBRARIES) +-# charset2html_DEPENDENCIES=3D $(LIBRARIES) ++# test_dir_DEPENDENCIES=3D $(LTLIBRARIES) ++# testhash_DEPENDENCIES=3D $(LTLIBRARIES) ++# test_charset_DEPENDENCIES=3D $(LTLIBRARIES) ++# charset2html_DEPENDENCIES=3D $(LTLIBRARIES) + EXTRA_PROGRAMS =3D=09 + DEFS =3D -DDEFAULT_BASEDIR=3D\"$(prefix)\" \ + -DMYSQL_DATADIR=3D"\"$(MYSQLDATAdir)\"" \ +@@ -71,8 +74,6 @@ + -DDEFAULT_SYSCONFDIR=3D"\"$(sysconfdir)\"" \ + @DEFS@ +=20 +-libmysys_a_DEPENDENCIES=3D @THREAD_LOBJECTS@ +- + # I hope this always does the right thing. Otherwise this is only test = programs + FLAGS=3D$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ +=20 +@@ -81,41 +82,41 @@ + # which automaticly removes the object files you use to compile a final= program + # +=20 +-test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES) ++test_thr_alarm$(EXEEXT): thr_alarm.c $(LTLIBRARIES) + $(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c + $(LINK) $(FLAGS) -DMAIN ./test_thr_alarm.c $(LDADD) $(LIBS) + $(RM) -f ./test_thr_alarm.c +=20 +-test_thr_lock$(EXEEXT): thr_lock.c $(LIBRARIES) ++test_thr_lock$(EXEEXT): thr_lock.c $(LTLIBRARIES) + $(CP) $(srcdir)/thr_lock.c test_thr_lock.c + $(LINK) $(FLAGS) -DMAIN ./test_thr_lock.c $(LDADD) $(LIBS) + $(RM) -f ./test_thr_lock.c +=20 +-test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LIBRARIES) ++test_vsnprintf$(EXEEXT): my_vsnprintf.c $(LTLIBRARIES) + $(CP) $(srcdir)/my_vsnprintf.c test_vsnprintf.c + $(LINK) $(FLAGS) -DMAIN ./test_vsnprintf.c $(LDADD) $(LIBS) + $(RM) -f test_vsnprintf.c +=20 +-test_io_cache$(EXEEXT): mf_iocache.c $(LIBRARIES) ++test_io_cache$(EXEEXT): mf_iocache.c $(LTLIBRARIES) + $(CP) $(srcdir)/mf_iocache.c test_io_cache.c + $(LINK) $(FLAGS) -DMAIN ./test_io_cache.c $(LDADD) $(LIBS) + $(RM) -f test_io_cache.c +=20 +-test_dir$(EXEEXT): test_dir.c $(LIBRARIES) ++test_dir$(EXEEXT): test_dir.c $(LTLIBRARIES) + $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_dir.c $(LDADD) $(LIBS) +=20 +-test_charset$(EXEEXT): test_charset.c $(LIBRARIES) ++test_charset$(EXEEXT): test_charset.c $(LTLIBRARIES) + $(LINK) $(FLAGS) -DMAIN $(srcdir)/test_charset.c $(LDADD) $(LIBS) +=20 +-testhash$(EXEEXT): testhash.c $(LIBRARIES) ++testhash$(EXEEXT): testhash.c $(LTLIBRARIES) + $(LINK) $(FLAGS) -DMAIN $(srcdir)/testhash.c $(LDADD) $(LIBS) +=20 +-test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LIBRARIES) ++test_gethwaddr$(EXEEXT): my_gethwaddr.c $(LTLIBRARIES) + $(CP) $(srcdir)/my_gethwaddr.c ./test_gethwaddr.c + $(LINK) $(FLAGS) -DMAIN ./test_gethwaddr.c $(LDADD) $(LIBS) + $(RM) -f ./test_gethwaddr.c +=20 +-test_base64$(EXEEXT): base64.c $(LIBRARIES) ++test_base64$(EXEEXT): base64.c $(LTLIBRARIES) + $(CP) $(srcdir)/base64.c ./test_base64.c + $(LINK) $(FLAGS) -DMAIN ./test_base64.c $(LDADD) $(LIBS) + $(RM) -f ./test_base64.c +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/config= /type_ndbapitest.mk.am mysql/ndb/config/type_ndbapitest.mk.am +--- mysql.orig/ndb/config/type_ndbapitest.mk.am 2012-03-02 06:04:13.0000= 00000 -0800 ++++ mysql/ndb/config/type_ndbapitest.mk.am 2012-04-01 10:47:50.443942002= -0700 +@@ -15,9 +15,9 @@ +=20 + LDADD +=3D $(top_builddir)/ndb/test/src/libNDBT.a \ + $(top_builddir)/ndb/src/libndbclient.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ +=20 + INCLUDES +=3D -I$(top_srcdir) \ + -I$(top_builddir)/include \ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/config= /type_ndbapitools.mk.am mysql/ndb/config/type_ndbapitools.mk.am +--- mysql.orig/ndb/config/type_ndbapitools.mk.am 2012-03-02 06:04:13.000= 000000 -0800 ++++ mysql/ndb/config/type_ndbapitools.mk.am 2012-04-01 10:47:50.44394200= 2 -0700 +@@ -15,9 +15,9 @@ +=20 + LDADD +=3D \ + $(top_builddir)/ndb/src/libndbclient.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ +=20 + INCLUDES +=3D -I$(srcdir) \ + -I$(top_builddir)/include \ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/config= /win-libraries mysql/ndb/config/win-libraries +--- mysql.orig/ndb/config/win-libraries 2012-03-02 06:04:08.000000000 -0= 800 ++++ mysql/ndb/config/win-libraries 2012-04-01 10:47:50.443942002 -0700 +@@ -36,7 +36,7 @@ + # the same goes for mysys and strings + lib=3D$i + case $i in +- *libdbug.a | *libmysys.a | *libmystrings.a)=20 ++ *libdbug.la | *libmysys.la | *libmystrings.la)=20 + lib=3D`echo $i | sed s'!dbug\/lib!!' | sed 's!mysys\/lib!!' | sed 's!= strings\/libmy!!'` + echo "Changing from $i to $lib" + ;; +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/src/co= mmon/util/Makefile.am mysql/ndb/src/common/util/Makefile.am +--- mysql.orig/ndb/src/common/util/Makefile.am 2012-03-02 06:04:12.00000= 0000 -0800 ++++ mysql/ndb/src/common/util/Makefile.am 2012-04-01 10:47:50.441941973 = -0700 +@@ -31,9 +31,9 @@ + testBitmask_SOURCES =3D testBitmask.cpp + testBitmask_LDFLAGS =3D @ndb_bin_am_ldflags@ \ + $(top_builddir)/ndb/src/libndbclient.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la +=20 + testBitmask.cpp : Bitmask.cpp + rm -f testBitmask.cpp +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/src/cw= /cpcd/Makefile.am mysql/ndb/src/cw/cpcd/Makefile.am +--- mysql.orig/ndb/src/cw/cpcd/Makefile.am 2012-03-02 06:04:12.000000000= -0800 ++++ mysql/ndb/src/cw/cpcd/Makefile.am 2012-04-01 10:47:50.442941987 -070= 0 +@@ -19,9 +19,9 @@ +=20 + LDADD_LOC =3D \ + $(top_builddir)/ndb/src/libndbclient.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ +=20 + include $(top_srcdir)/ndb/config/common.mk.am + include $(top_srcdir)/ndb/config/type_util.mk.am +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/src/ke= rnel/blocks/dbdict/Makefile.am mysql/ndb/src/kernel/blocks/dbdict/Makefil= e.am +--- mysql.orig/ndb/src/kernel/blocks/dbdict/Makefile.am 2012-03-02 06:04= :12.000000000 -0800 ++++ mysql/ndb/src/kernel/blocks/dbdict/Makefile.am 2012-04-01 10:47:50.4= 42941987 -0700 +@@ -26,9 +26,9 @@ + LDADD +=3D \ + $(top_builddir)/ndb/src/common/util/libgeneral.la \ + $(top_builddir)/ndb/src/common/portlib/libportlib.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la +=20 + # Don't update the files from bitkeeper + %::SCCS/s.% +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/src/ke= rnel/Makefile.am mysql/ndb/src/kernel/Makefile.am +--- mysql.orig/ndb/src/kernel/Makefile.am 2012-03-02 06:04:12.000000000 = -0800 ++++ mysql/ndb/src/kernel/Makefile.am 2012-04-01 10:47:50.442941987 -0700 +@@ -66,9 +66,9 @@ + $(top_builddir)/ndb/src/mgmapi/libmgmapi.la \ + $(top_builddir)/ndb/src/common/portlib/libportlib.la = \ + $(top_builddir)/ndb/src/common/util/libgeneral.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ +=20 + # Don't update the files from bitkeeper + %::SCCS/s.% +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/src/mg= mclient/Makefile.am mysql/ndb/src/mgmclient/Makefile.am +--- mysql.orig/ndb/src/mgmclient/Makefile.am 2012-03-02 06:04:12.0000000= 00 -0800 ++++ mysql/ndb/src/mgmclient/Makefile.am 2012-04-01 10:47:50.442941987 -0= 700 +@@ -37,9 +37,9 @@ + ../common/portlib/libportlib.la \ + @readline_link@ \ + $(top_builddir)/ndb/src/libndbclient.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a \ ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la \ + @TERMCAP_LIB@ @NDB_SCI_LIBS@ +=20 + ndb_mgm_LDFLAGS =3D @ndb_bin_am_ldflags@ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/src/mg= msrv/Makefile.am mysql/ndb/src/mgmsrv/Makefile.am +--- mysql.orig/ndb/src/mgmsrv/Makefile.am 2012-03-02 06:04:08.000000000 = -0800 ++++ mysql/ndb/src/mgmsrv/Makefile.am 2012-04-01 10:47:50.442941987 -0700 +@@ -41,9 +41,9 @@ +=20 + LDADD_LOC =3D $(top_builddir)/ndb/src/mgmclient/CommandInterpreter.lo \ + $(top_builddir)/ndb/src/libndbclient.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a \ ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la \ + @readline_link@ \ + @NDB_SCI_LIBS@ \ + @TERMCAP_LIB@ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/ndb/test/r= un-test/Makefile.am mysql/ndb/test/run-test/Makefile.am +--- mysql.orig/ndb/test/run-test/Makefile.am 2012-03-02 06:04:12.0000000= 00 -0800 ++++ mysql/ndb/test/run-test/Makefile.am 2012-04-01 10:47:50.443942002 -0= 700 +@@ -32,9 +32,9 @@ + INCLUDES_LOC =3D -I$(top_srcdir)/ndb/test/include + LDADD_LOC =3D $(top_builddir)/ndb/test/src/libNDBT.a \ + $(top_builddir)/ndb/src/libndbclient.la \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@ ++ $(top_builddir)/dbug/libdbug.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la @NDB_SCI_LIBS@ +=20 + wrappersdir=3D$(prefix)/bin + wrappers_SCRIPTS=3Datrt-testBackup atrt-mysql-test-run +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/netware/Ma= kefile.am mysql/netware/Makefile.am +--- mysql.orig/netware/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/netware/Makefile.am 2012-04-01 10:47:50.437941915 -0700 +@@ -16,14 +16,13 @@ +=20 + if HAVE_NETWARE + INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include -I.. +-LDADD =3D @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ +- ../dbug/libdbug.a ../strings/libmystrings.a ++LDADD =3D @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la + bin_PROGRAMS =3D mysqld_safe mysql_install_db mysql_test_run libmysql + mysqld_safe_SOURCES=3D mysqld_safe.c my_manage.c + mysql_install_db_SOURCES=3D mysql_install_db.c my_manage.c + mysql_test_run_SOURCES=3D mysql_test_run.c my_manage.c + libmysql_SOURCES=3D libmysqlmain.c +-libmysql_LDADD =3D ../libmysql/.libs/libmysqlclient.a \ ++libmysql_LDADD =3D ../libmysql/.libs/libmysqlclient.la \ + @openssl_libs@ @yassl_libs@ +=20 + netware_build_files =3D client/mysql.def client/mysqladmin.de= f \ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/pstack/Mak= efile.am mysql/pstack/Makefile.am +--- mysql.orig/pstack/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/pstack/Makefile.am 2012-04-01 10:47:50.438941930 -0700 +@@ -27,8 +27,8 @@ + EXTRA_DIST=3D $(SRC) +=20 + if COMPILE_PSTACK +-pkglib_LIBRARIES =3D libpstack.a +-libpstack_a_SOURCES =3D bucomm.c filemode.c linuxthreads.c rddbg.c debu= g.c ieee.c pstack.c stabs.c ++pkglib_LTLIBRARIES =3D libpstack.la ++libpstack_la_SOURCES =3D bucomm.c filemode.c linuxthreads.c rddbg.c deb= ug.c ieee.c pstack.c stabs.c + endif +=20 + # Don't update the files from bitkeeper +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/regex/Make= file.am mysql/regex/Makefile.am +--- mysql.orig/regex/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/regex/Makefile.am 2012-04-01 10:47:50.439941945 -0700 +@@ -16,10 +16,10 @@ + # MA 02111-1307, USA +=20 + INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include +-noinst_LIBRARIES =3D libregex.a +-LDADD=3D libregex.a $(top_builddir)/strings/libmystrings.a ++noinst_LTLIBRARIES =3D libregex.la ++LDADD=3D libregex.la $(top_builddir)/strings/libmystrings.la + noinst_HEADERS =3D cclass.h cname.h regex2.h utils.h engine.c my_regex.= h +-libregex_a_SOURCES =3D regerror.c regcomp.c regexec.c regfree.c reginit= .c ++libregex_la_SOURCES =3D regerror.c regcomp.c regexec.c regfree.c regini= t.c + noinst_PROGRAMS =3D re + re_SOURCES =3D split.c debug.c main.c + re_LDFLAGS=3D @NOINST_LDFLAGS@ +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/server-too= ls/instance-manager/Makefile.am mysql/server-tools/instance-manager/Makef= ile.am +--- mysql.orig/server-tools/instance-manager/Makefile.am 2012-03-02 06:0= 4:12.000000000 -0800 ++++ mysql/server-tools/instance-manager/Makefile.am 2012-04-01 10:47:50.= 439941945 -0700 +@@ -24,8 +24,7 @@ + # default_options.h, generated from default_options.h.in) + # See automake/autoconf docs for details +=20 +-noinst_LTLIBRARIES=3D liboptions.la +-noinst_LIBRARIES=3D libnet.a ++noinst_LTLIBRARIES=3D liboptions.la libnet.la +=20 + liboptions_la_CXXFLAGS=3D $(CXXFLAGS) \ + -DDEFAULT_PID_FILE_NAME=3D"$(localstatedir)/mysqlmanager.pid" \ +@@ -37,17 +36,17 @@ + -DPROTOCOL_VERSION=3D@PROTOCOL_VERSION@ +=20 + liboptions_la_SOURCES=3D options.h options.cc priv.h priv.cc +-liboptions_la_LIBADD=3D $(top_builddir)/libmysql/get_password.lo ++ ++liboptions_la_LIBADD=3D $(top_builddir)/libmysql/libmysqlclient.la +=20 + # MySQL sometimes uses symlinks to reuse code=20 + # All symlinked files are grouped in libnet.a +=20 +-nodist_libnet_a_SOURCES=3D net_serv.cc client_settings.h +-libnet_a_LIBADD=3D $(top_builddir)/sql/password.$(OBJEXT) \ +- $(top_builddir)/sql/pack.$(OBJEXT) \ +- $(top_builddir)/sql/sql_state.$(OBJEXT) \ +- $(top_builddir)/sql/mini_client_errors.$(OBJEXT)\ +- $(top_builddir)/sql/client.$(OBJEXT) ++nodist_libnet_la_SOURCES=3D net_serv.cc client_settings.h \ ++ $(srcdir)/../../sql/password.c $(srcdir)/../../sql/pack.c \ ++ $(srcdir)/../../sql/sql_state.c $(srcdir)/../../sql/mini_client_errors= .c \ ++ $(srcdir)/../../sql/client.c ++ +=20 + CLEANFILES=3D net_serv.cc client_settings.h +=20 +@@ -79,11 +78,11 @@ + portability.h +=20 + mysqlmanager_LDADD=3D liboptions.la \ +- libnet.a \ +- $(top_builddir)/vio/libvio.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/strings/libmystrings.a \ +- $(top_builddir)/dbug/libdbug.a \ ++ libnet.la \ ++ $(top_builddir)/vio/libvio.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/strings/libmystrings.la \ ++ $(top_builddir)/dbug/libdbug.la \ + @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@ +=20 +=20 +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/sql/Makefi= le.am mysql/sql/Makefile.am +--- mysql.orig/sql/Makefile.am 2012-03-02 06:04:08.000000000 -0800 ++++ mysql/sql/Makefile.am 2012-04-01 10:47:50.440941959 -0700 +@@ -30,18 +30,17 @@ + EXTRA_PROGRAMS =3D gen_lex_hash + bin_PROGRAMS =3D mysql_tzinfo_to_sql + gen_lex_hash_LDFLAGS =3D @NOINST_LDFLAGS@ +-LDADD =3D $(top_builddir)/myisam/libmyisam.a \ +- $(top_builddir)/myisammrg/libmyisammrg.a \ +- $(top_builddir)/heap/libheap.a \ +- $(top_builddir)/vio/libvio.a \ +- $(top_builddir)/mysys/libmysys.a \ +- $(top_builddir)/dbug/libdbug.a \ +- $(top_builddir)/regex/libregex.a \ +- $(top_builddir)/strings/libmystrings.a @ZLIB_LIBS@ @NDB_SCI_LIBS@ ++LDADD =3D $(top_builddir)/myisam/libmyisam.la \ ++ $(top_builddir)/myisammrg/libmyisammrg.la \ ++ $(top_builddir)/heap/libheap.la \ ++ $(top_builddir)/vio/libvio.la \ ++ $(top_builddir)/mysys/libmysys.la \ ++ $(top_builddir)/regex/libregex.la \ ++ @ZLIB_LIBS@ @NDB_SCI_LIBS@ +=20 + mysqld_LDADD =3D @MYSQLD_EXTRA_LDFLAGS@ \ +- @bdb_libs@ @innodb_libs@ @pstack_libs@ \ +- @innodb_system_libs@ \ ++ @bdb_libs@ $(top_builddir)/innobase/libinnobase.la \ ++ @pstack_libs@ @innodb_system_libs@ \ + @ndbcluster_libs@ @ndbcluster_system_libs@ \ + $(LDADD) $(CXXLDFLAGS) $(WRAPLIBS) @LIBDL@ \ + $(yassl_libs) $(openssl_libs) @MYSQLD_EXTRA_LIBS@ +@@ -53,45 +52,36 @@ + procedure.h sql_class.h sql_lex.h sql_list.h \ + sql_manager.h sql_map.h sql_string.h unireg.h \ + sql_error.h field.h handler.h mysqld_suffix.h \ +- sql_profile.h \ +- ha_myisammrg.h\ +- ha_heap.h ha_myisam.h ha_berkeley.h ha_innodb.h \ +- ha_ndbcluster.h ha_ndbcluster_cond.h \ +- opt_range.h protocol.h \ +- sql_select.h structs.h table.h sql_udf.h hash_filo.h\ +- lex.h lex_symbol.h sql_acl.h sql_crypt.h \ +- log_event.h sql_repl.h slave.h \ +- stacktrace.h sql_sort.h sql_cache.h set_var.h \ +- spatial.h gstream.h client_settings.h tzfile.h \ +- tztime.h my_decimal.h\ ++ sql_profile.h ha_heap.h ha_berkeley.h ha_innodb.h \ ++ ha_ndbcluster.h ha_ndbcluster_cond.h opt_range.h \ ++ protocol.h sql_select.h structs.h table.h sql_udf.h \ ++ hash_filo.h lex.h lex_symbol.h sql_acl.h sql_crypt.h \ ++ log_event.h sql_repl.h slave.h stacktrace.h sql_sort.h \ ++ sql_cache.h set_var.h spatial.h gstream.h \ ++ client_settings.h tzfile.h tztime.h my_decimal.h \ + sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \ + parse_file.h sql_view.h sql_trigger.h \ +- sql_array.h sql_cursor.h \ +- examples/ha_example.h ha_archive.h \ +- examples/ha_tina.h ha_blackhole.h \ ++ sql_array.h sql_cursor.h examples/ha_example.h \ ++ ha_archive.h examples/ha_tina.h ha_blackhole.h \ + ha_federated.h +-mysqld_SOURCES =3D sql_lex.cc sql_handler.cc \ +- item.cc item_sum.cc item_buff.cc item_func.cc \ +- item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \ +- thr_malloc.cc item_create.cc item_subselect.cc \ +- item_row.cc item_geofunc.cc \ +- field.cc strfunc.cc key.cc sql_class.cc sql_list.cc \ +- net_serv.cc protocol.cc sql_state.c \ +- lock.cc my_lock.c \ +- sql_string.cc sql_manager.cc sql_map.cc \ +- mysqld.cc password.c hash_filo.cc hostname.cc \ +- set_var.cc sql_parse.cc sql_yacc.yy \ +- sql_base.cc table.cc sql_select.cc sql_insert.cc \ +- sql_prepare.cc sql_error.cc sql_locale.cc \ +- sql_profile.cc \ +- sql_update.cc sql_delete.cc uniques.cc sql_do.cc \ +- procedure.cc item_uniq.cc sql_test.cc \ +- log.cc log_event.cc init.cc derror.cc sql_acl.cc \ +- unireg.cc des_key_file.cc \ +- discover.cc time.cc opt_range.cc opt_sum.cc \ +- records.cc filesort.cc handler.cc \ +- ha_heap.cc ha_myisam.cc ha_myisammrg.cc \ +- ha_berkeley.cc ha_innodb.cc \ ++mysqld_SOURCES =3D sql_lex.cc sql_handler.cc item.cc item_sum.cc \ ++ item_buff.cc item_func.cc item_cmpfunc.cc \ ++ item_strfunc.cc item_timefunc.cc thr_malloc.cc \ ++ item_create.cc item_subselect.cc item_row.cc \ ++ item_geofunc.cc field.cc strfunc.cc key.cc \ ++ sql_class.cc sql_list.cc net_serv.cc protocol.cc \ ++ sql_state.c lock.cc my_lock.c sql_string.cc \ ++ sql_manager.cc sql_map.cc mysqld.cc password.c \ ++ hash_filo.cc hostname.cc set_var.cc sql_parse.cc \ ++ sql_yacc.yy sql_base.cc table.cc sql_select.cc \ ++ sql_insert.cc sql_prepare.cc sql_error.cc \ ++ sql_locale.cc sql_profile.cc sql_update.cc \ ++ sql_delete.cc uniques.cc sql_do.cc procedure.cc \ ++ item_uniq.cc sql_test.cc log.cc log_event.cc \ ++ init.cc derror.cc sql_acl.cc unireg.cc \ ++ des_key_file.cc discover.cc time.cc opt_range.cc \ ++ opt_sum.cc records.cc filesort.cc handler.cc \ ++ ha_heap.cc ha_berkeley.cc ha_innodb.cc \ + ha_ndbcluster.cc ha_ndbcluster_cond.cc \ + sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \ + sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \ +@@ -99,14 +89,13 @@ + slave.cc sql_repl.cc sql_union.cc sql_derived.cc \ + client.c sql_client.cc mini_client_errors.c pack.c\ + stacktrace.c repl_failsafe.h repl_failsafe.cc \ +- sql_olap.cc sql_view.cc \ +- gstream.cc spatial.cc sql_help.cc sql_cursor.cc \ +- tztime.cc my_time.c my_user.c my_decimal.cc\ +- sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \ +- sp_cache.cc parse_file.cc sql_trigger.cc \ +- examples/ha_example.cc ha_archive.cc \ +- examples/ha_tina.cc ha_blackhole.cc \ +- ha_federated.cc ++ sql_olap.cc sql_view.cc gstream.cc spatial.cc \ ++ sql_help.cc sql_cursor.cc tztime.cc my_time.c \ ++ my_user.c my_decimal.cc sp_head.cc sp_pcontext.cc \ ++ sp_rcontext.cc sp.cc sp_cache.cc parse_file.cc \ ++ sql_trigger.cc examples/ha_example.cc ha_archive.cc \ ++ examples/ha_tina.cc ha_blackhole.cc ha_federated.cc \ ++ ha_myisam.cc ha_myisammrg.cc +=20 + gen_lex_hash_SOURCES =3D gen_lex_hash.cc + gen_lex_hash_LDADD =3D $(LDADD) $(CXXLDFLAGS) +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/strings/Ma= kefile.am mysql/strings/Makefile.am +--- mysql.orig/strings/Makefile.am 2012-03-02 06:04:08.000000000 -0800 ++++ mysql/strings/Makefile.am 2012-04-01 10:47:50.440941959 -0700 +@@ -17,7 +17,7 @@ + # This file is public domain and comes with NO WARRANTY of any kind +=20 + INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include +-pkglib_LIBRARIES =3D libmystrings.a ++noinst_LTLIBRARIES =3D libmystrings.la +=20 + # Exact one of ASSEMBLER_X + if ASSEMBLER_x86 +@@ -38,7 +38,7 @@ + endif + endif +=20 +-libmystrings_a_SOURCES =3D $(ASRCS) $(CSRCS) ++libmystrings_la_SOURCES =3D $(ASRCS) $(CSRCS) + noinst_PROGRAMS =3D conf_to_src + # Default charset definitions + EXTRA_DIST =3D ctype-big5.c ctype-cp932.c ctype-czech.c ctype-eucjpms.= c ctype-euc_kr.c ctype-win1250ch.c \ +@@ -55,25 +55,25 @@ + strnmov-sparc.s strstr-sparc.s strxmov-sparc.s \ + t_ctype.h CMakeLists.txt CHARSET_INFO.txt +=20 +-libmystrings_a_LIBADD=3D +-conf_to_src_SOURCES =3D conf_to_src.c xml.c ctype.c bcmp.c +-conf_to_src_LDADD=3D ++libmystrings_la_LIBADD=3D ++conf_to_src_SOURCES =3D conf_to_src.c ++conf_to_src_LDADD =3D libmystrings.la + #force static linking of conf_to_src - essential when linking against + #custom installation of libc +-conf_to_src_LDFLAGS=3D @NOINST_LDFLAGS@ ++#conf_to_src_LDFLAGS=3D @NOINST_LDFLAGS@ +=20 + # This is because the dependency tracking misses @FOO@ vars in sources. + #strtoull.o: @CHARSET_OBJS@ +=20 +=20 +-FLAGS=3D$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ ++FLAGS=3D$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +=20 +-str_test: str_test.c $(pkglib_LIBRARIES) +- $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pk= glib_LIBRARIES) ++str_test: str_test.c $(pkglib_LTLIBRARIES) ++ $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pk= glib_LTLIBRARIES) +=20 +-test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES) ++test_decimal$(EXEEXT): decimal.c $(pkglib_LTLIBRARIES) + $(CP) $(srcdir)/decimal.c ./test_decimal.c +- $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES) ++ $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LTLIBRARIE= S) + $(RM) -f ./test_decimal.c +=20 + # Don't update the files from bitkeeper +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/strings/st= rings-x86.s mysql/strings/strings-x86.s +--- mysql.orig/strings/strings-x86.s 2012-03-02 06:04:13.000000000 -0800 ++++ mysql/strings/strings-x86.s 2012-04-01 10:47:50.440941959 -0700 +@@ -293,7 +293,7 @@ + movl %esp,%ebp + pushl 12(%ebp) # search + pushl 8(%ebp) # str +- call strstr ++ call strstr@plt + add $8,%esp + or %eax,%eax + jz si_99 # Not found, return NULL +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/tests/Make= file.am mysql/tests/Makefile.am +--- mysql.orig/tests/Makefile.am 2012-03-02 06:04:07.000000000 -0800 ++++ mysql/tests/Makefile.am 2012-04-01 10:47:50.441941973 -0700 +@@ -42,11 +42,11 @@ +=20 + insert_test_SOURCES=3D insert_test.c + select_test_SOURCES=3D select_test.c +-insert_test_DEPENDENCIES=3D $(LIBRARIES) $(pkglib_LTLIBRARIES) +-select_test_DEPENDENCIES=3D $(LIBRARIES) $(pkglib_LTLIBRARIES) ++insert_test_DEPENDENCIES=3D $(LTLIBRARIES) $(pkglib_LTLIBRARIES) ++select_test_DEPENDENCIES=3D $(LTLIBRARIES) $(pkglib_LTLIBRARIES) +=20 + bug25714_SOURCES=3D bug25714.c +-bug25714_DEPENDENCIES=3D $(LIBRARIES) $(pkglib_LTLIBRARIES) ++bug25714_DEPENDENCIES=3D $(LTLIBRARIES) $(pkglib_LTLIBRARIES) +=20 + # Fix for mit-threads + DEFS =3D -DUNDEF_THREADS_HACK +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/tools/Make= file.am mysql/tools/Makefile.am +--- mysql.orig/tools/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/tools/Makefile.am 2012-04-01 10:47:50.441941973 -0700 +@@ -23,7 +23,7 @@ +=20 + bin_PROGRAMS=3D mysqltestmanager + mysqltestmanager_SOURCES=3D mysqlmanager.c +-mysqltestmanager_DEPENDENCIES=3D $(LIBRARIES) $(pkglib_LTLIBRARIES) ++mysqltestmanager_DEPENDENCIES=3D $(LTLIBRARIES) $(pkglib_LTLIBRARIES) + DEF=3D -DUNDEF_THREADS_HACK +=20 + # Don't update the files from bitkeeper +diff -NuarwbB --exclude '*.orig' --exclude '*.rej' mysql.orig/vio/Makefi= le.am mysql/vio/Makefile.am +--- mysql.orig/vio/Makefile.am 2012-03-02 06:04:12.000000000 -0800 ++++ mysql/vio/Makefile.am 2012-04-01 10:47:50.441941973 -0700 +@@ -16,11 +16,12 @@ + INCLUDES =3D -I$(top_builddir)/include -I$(top_srcdir)/include \ + $(openssl_includes) + LDADD =3D @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) +-pkglib_LIBRARIES =3D libvio.a ++pkglib_LTLIBRARIES =3D libvio.la +=20 + noinst_HEADERS =3D vio_priv.h +=20 +-libvio_a_SOURCES =3D vio.c viosocket.c viossl.c viosslfactories.c ++libvio_la_LIBADD =3D -lssl ++libvio_la_SOURCES =3D vio.c viosocket.c viossl.c viosslfactories.c +=20 + EXTRA_DIST=3D CMakeLists.txt +=20