2007-07-02 <aconway@redhat.com

         * qpid/sys/Shlib.h, .cpp: Portable shared library abstraction.
          - Shlib: load, unload, getSymbol
          - AutoShlib: unload in destructor.
         * qpid/sys/apr/Shlib.cpp sys/posix/Shlib.cpp: APR/Posix impls

         * qpid/sys/Module.h: Reimplemented Module in terms of AutoShlib.
         * qpid/Plugin.cpp, .h: Removed dlopen - use Shlib instead.

         * qpid/broker/Broker.cpp: Added missing #include "qpid/log/Statement.h"
         * tests/Shlib.cpp, shlibtest.cpp: Unit test


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@553056 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 25 insertions, 16 deletions

diff --git a/qpid/cpp/src/tests/Makefile.am b/qpid/cpp/src/tests/Makefile.am
index 3adf8818db..76f821798d 100644
--- a/qpid/cpp/src/tests/Makefile.am
+++ b/qpid/cpp/src/tests/Makefile.am
@@ -11,6 +11,7 @@ lib_broker = $(abs_builddir)/../libqpidbroker.la
 # Initialize variables that are incremented with +=
 # 
 check_PROGRAMS=
+check_LTLIBRARIES=
 TESTS=
 EXTRA_DIST=
 
@@ -32,6 +33,15 @@ check_PROGRAMS+=Uuid
 Uuid_SOURCES=Uuid.cpp test_tools.h
 Uuid_LDADD=-lboost_unit_test_framework $(lib_common) 
 
+check_LTLIBRARIES += libshlibtest.la
+libshlibtest_la_LDFLAGS = -module -rpath $(abs_builddir)
+libshlibtest_la_SOURCES = shlibtest.cpp
+
+TESTS+=Shlib
+check_PROGRAMS+=Shlib
+Shlib_SOURCES=Shlib.cpp
+Shlib_LDADD=-lboost_unit_test_framework $(lib_common)
+
 include cluster.mk
 
 # NB: CppUnit test libraries below will be migrated to boost test programs.
@@ -112,24 +122,23 @@ EXTRA_DIST +=								\
 include gen.mk
 
 check_LTLIBRARIES += libdlclose_noop.la
-libdlclose_noop_la_LDFLAGS = -module -rpath /home/aconway/svn/qpid/cpp/tests
+libdlclose_noop_la_LDFLAGS = -module -rpath $(abs_builddir)
 libdlclose_noop_la_SOURCES = dlclose_noop.c
 
 gen.mk: Makefile.am
-	(					\
-	  for i in $(testprogs); do		\
-	    echo $${i}_SOURCES = $$i.cpp;	\
-	    echo $${i}_LDADD = '$$(lib_client) $$(lib_common) $$(extra_libs)'; \
-	  done;					\
-	  libs=;				\
-	  for i in $(unit_tests); do		\
-	    libs="$$libs $${i}.la";		\
-	    echo $${i}_la_SOURCES = $$i.cpp;	\
-	    echo $${i}_la_LIBADD = '$$(lib_common) $$(lib_client)';	\
-	    echo $${i}_la_LIBADD += '$$(lib_broker) $$(extra_libs)';	\
-	    echo $${i}_la_LDFLAGS = "-module -rpath `pwd`";	\
-	  done;					\
-	  echo "check_LTLIBRARIES =$$libs";	\
+	(									\
+	  for i in $(testprogs); do						\
+	    echo $${i}_SOURCES = $$i.cpp;					\
+	    echo $${i}_LDADD = '$$(lib_client) $$(lib_common) $$(extra_libs)';	\
+	  done;									\
+	  libs=;								\
+	  for i in $(unit_tests); do						\
+	    echo "check_LTLIBRARIES +=$${i}.la";				\
+	    echo $${i}_la_SOURCES = $$i.cpp;					\
+	    echo $${i}_la_LIBADD = '$$(lib_common) $$(lib_client)';		\
+	    echo $${i}_la_LIBADD += '$$(lib_broker) $$(extra_libs)';		\
+	    echo $${i}_la_LDFLAGS = "-module -rpath `pwd`";			\
+	  done;									\
 	)					\
 	> $@-t
 	mv $@-t $@
@@ -138,7 +147,7 @@ check-unit:
 	$(MAKE) check TESTS=$(UNIT_TESTS) run-unit-tests
 
 # Make sure valgrind files are generated.
-all: .valgrind.supp .valgrindrc
+all-am: .valgrind.supp .valgrindrc
 
 # Create a copy so that can be modified without risk of committing the changes.
 .valgrindrc: .valgrindrc-default