[Commits] Rev 2929: MWL#74: libmysqld.so; after-review fixes. in http://bazaar.launchpad.net/~maria-captains/maria/5.1

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Thu Sep 30 14:53:02 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.1

------------------------------------------------------------
revno: 2929
revision-id: knielsen at knielsen-hq.org-20100930115302-16jdmwyy7fbgsknl
parent: knielsen at knielsen-hq.org-20100928130742-foy9cs3e100wdn79
committer: knielsen at knielsen-hq.org
branch nick: work-5.1-mwl74
timestamp: Thu 2010-09-30 13:53:02 +0200
message:
  MWL#74: libmysqld.so; after-review fixes.
=== modified file 'config/ac-macros/plugins.m4'
--- a/config/ac-macros/plugins.m4	2010-09-27 13:27:47 +0000
+++ b/config/ac-macros/plugins.m4	2010-09-30 11:53:02 +0000
@@ -332,20 +332,20 @@ AC_DEFUN([_MYSQL_EMIT_CHECK_PLUGIN],[
  )
 ])
 
-# __MYSQL_EMIT_CHECK_PLUGIN arguments:
-#
-#  1 - plugin identifying name
-#  2 - plugin identifying name, with `-' replaced by `_'
-#  3 - plugin long name
-#  4 - plugin description
-#  5 - mysql_plugin_define (eg. WITH_xxx_STORAGE_ENGINE)
-#  6 - directory
-#  7 - static target (if supports static build)
-#  8 - dynamic target (if supports dynamic build)
-#  9 - mandatory flag
-# 10 - disabled flag
-# 11 - static target for libmysqld (if different from mysqld)
-# 12 - actions
+dnl __MYSQL_EMIT_CHECK_PLUGIN arguments:
+dnl
+dnl  1 - plugin identifying name
+dnl  2 - plugin identifying name, with `-' replaced by `_'
+dnl  3 - plugin long name
+dnl  4 - plugin description
+dnl  5 - mysql_plugin_define (eg. WITH_xxx_STORAGE_ENGINE)
+dnl  6 - directory
+dnl  7 - static target (if supports static build)
+dnl  8 - dynamic target (if supports dynamic build)
+dnl  9 - mandatory flag
+dnl 10 - disabled flag
+dnl 11 - static target for libmysqld (if different from $7)
+dnl 12 - actions
 AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[
  m4_ifdef([$5],[
   AH_TEMPLATE($5, [Include ]$4[ into mysqld])
@@ -539,8 +539,8 @@ dnl
  ])
 ])
 
-dnl If not building libmysqld embedded server, then there is no need to build
-dnl shared object versions of static plugins.
+# If not building libmysqld embedded server, then there is no need to build
+# shared object versions of static plugins.
 if test "$with_embedded_server" = "yes"; then
   AC_SUBST([plugin_static_if_no_embedded], "")
 else

=== modified file 'dbug/Makefile.am'
--- a/dbug/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/dbug/Makefile.am	2010-09-30 11:53:02 +0000
@@ -16,7 +16,7 @@
 # MA 02111-1307, USA
 
 INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include
-LDADD =                 libdbug.la ../mysys/libmysys.la ../strings/libmystrings.la
+LDADD =                 libdbug.la $(top_builddir)/mysys/libmysys.la $(top_builddir)/strings/libmystrings.la
 pkglib_LTLIBRARIES =    libdbug.la
 noinst_HEADERS =        dbug_long.h
 libdbug_la_SOURCES =    dbug.c sanity.c

=== modified file 'extra/Makefile.am'
--- a/extra/Makefile.am	2010-09-16 12:49:35 +0000
+++ b/extra/Makefile.am	2010-09-30 11:53:02 +0000
@@ -15,8 +15,10 @@
 
 INCLUDES =              -I$(top_builddir)/include -I$(top_srcdir)/include \
                         -I$(top_srcdir)/sql
-LDADD =                 @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.la \
-                        ../dbug/libdbug.la ../strings/libmystrings.la \
+LDADD =                 @CLIENT_EXTRA_LDFLAGS@ \
+                        $(top_builddir)/mysys/libmysys.la \
+                        $(top_builddir)/dbug/libdbug.la \
+                        $(top_builddir)/strings/libmystrings.la \
                         $(ZLIB_LIBS)
 BUILT_SOURCES=          $(top_builddir)/include/mysqld_error.h \
                         $(top_builddir)/include/sql_state.h \

=== modified file 'libmysqld/examples/Makefile.am'
--- a/libmysqld/examples/Makefile.am	2010-09-28 13:07:42 +0000
+++ b/libmysqld/examples/Makefile.am	2010-09-30 11:53:02 +0000
@@ -37,7 +37,8 @@ INCLUDES =	-I$(top_builddir)/include -I$
                 -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
                 $(openssl_includes)
 LIBS =          @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ $(yassl_libs)
-LDADD =         @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.la @LIBDL@ $(CXXLDFLAGS) \
+LDADD =         @CLIENT_EXTRA_LDFLAGS@ \
+                $(top_builddir)/libmysqld/libmysqld.la @LIBDL@ $(CXXLDFLAGS) \
                 @ndbcluster_libs@ @NDB_SCI_LIBS@ \
                 $(top_builddir)/mysys/libmysys.la \
                 $(top_builddir)/strings/libmystrings.la \



More information about the commits mailing list