Comitted. On Fri, 2007-01-05 at 20:16 +0100, Jim Meyering wrote: > Here's the fix for the undefined-non-weak-symbols problem reported > by Jason Tibbits in http://bugzilla.redhat.com/220630: > [also cleaned up white space] > > 2007-01-05 Jim Meyering <[EMAIL PROTECTED]> > > * lib/broker/Makefile.am (libqpidbroker_la_LIBADD): Define, so we > link with libqpidcommon.la. > * lib/client/Makefile.am (libqpidclient_la_LIBADD): Likewise. > > Index: lib/broker/Makefile.am > =================================================================== > --- lib/broker/Makefile.am (revision 493033) > +++ lib/broker/Makefile.am (working copy) > @@ -7,8 +7,9 @@ > $(APR_CXXFLAGS) > > lib_LTLIBRARIES = libqpidbroker.la > +libqpidbroker_la_LIBADD = ../common/libqpidcommon.la > libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) > -libqpidbroker_la_SOURCES = \ > +libqpidbroker_la_SOURCES = \ > AccumulatedAck.cpp \ > AccumulatedAck.h \ > AutoDelete.cpp \ > Index: lib/client/Makefile.am > =================================================================== > --- lib/client/Makefile.am (revision 493033) > +++ lib/client/Makefile.am (working copy) > @@ -7,8 +7,9 @@ > $(APR_CXXFLAGS) > > lib_LTLIBRARIES = libqpidclient.la > +libqpidclient_la_LIBADD = ../common/libqpidcommon.la > libqpidclient_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG) > -libqpidclient_la_SOURCES = \ > +libqpidclient_la_SOURCES = \ > ClientChannel.cpp \ > ClientExchange.cpp \ > ClientMessage.cpp \ > @@ -19,7 +20,7 @@ > MessageListener.cpp \ > ResponseHandler.cpp \ > ReturnedMessageHandler.cpp > -pkginclude_HEADERS = \ > +pkginclude_HEADERS = \ > ClientChannel.h \ > ClientExchange.h \ > ClientMessage.h \
