bk commit into 5.0 tree (kent:1.2096) BUG#17155

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2096 06/03/03 02:46:47 kent@stripped +1 -0
  Makefile.am:
    Use libtool convenience lib, to access get_password object correctly, bug#17155

  server-tools/instance-manager/Makefile.am
    1.31 06/03/03 02:46:23 kent@stripped +6 -5
    Use libtool convenience lib, to access get_password object correctly, bug#17155

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-524072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-release

--- 1.30/server-tools/instance-manager/Makefile.am	2006-02-10 00:15:52 +01:00
+++ 1.31/server-tools/instance-manager/Makefile.am	2006-03-03 02:46:23 +01:00
@@ -24,9 +24,10 @@
 # default_options.h, generated from default_options.h.in)
 # See automake/autoconf docs for details
 
-noinst_LIBRARIES= liboptions.a libnet.a
+noinst_LTLIBRARIES= liboptions.la
+noinst_LIBRARIES=   libnet.a
 
-liboptions_a_CXXFLAGS= $(CXXFLAGS) \
+liboptions_la_CXXFLAGS= $(CXXFLAGS) \
 	-DDEFAULT_PID_FILE_NAME="$(localstatedir)/mysqlmanager.pid" \
 	-DDEFAULT_LOG_FILE_NAME="$(localstatedir)/mysqlmanager.log" \
 	-DDEFAULT_SOCKET_FILE_NAME="/tmp/mysqlmanager.sock" \
@@ -35,8 +36,8 @@
 	-DDEFAULT_CONFIG_FILE="/etc/my.cnf" \
 	-DPROTOCOL_VERSION=@PROTOCOL_VERSION@
 
-liboptions_a_SOURCES= options.h options.cc priv.h priv.cc
-liboptions_a_LIBADD= $(top_builddir)/libmysql/get_password.$(OBJEXT)
+liboptions_la_SOURCES= options.h options.cc priv.h priv.cc
+liboptions_la_LIBADD= $(top_builddir)/libmysql/get_password.lo
 
 # MySQL sometimes uses symlinks to reuse code 
 # All symlinked files are grouped in libnet.a
@@ -77,7 +78,7 @@
                         mysql_manager_error.h \
                         portability.h
 
-mysqlmanager_LDADD=	liboptions.a \
+mysqlmanager_LDADD=	liboptions.la \
 			libnet.a \
 			$(top_builddir)/vio/libvio.a \
 			$(top_builddir)/mysys/libmysys.a \