diff --git a/mrw/makefile.am b/mrw/makefile.am
index c0eac78..e184a6d 100644
--- a/mrw/makefile.am
+++ b/mrw/makefile.am
@@ -9,6 +9,10 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.22  2005/02/18 15:51:08  marc
+## new dynamiclibrary.hpp
+## tests are now compiled with option -O0
+##
 ## Revision 1.21  2005/02/08 12:34:14  marc
 ## added errno / unix_error
 ##
@@ -104,7 +108,7 @@ endif
 #                    smartpointer.hpp stdext.cpp stdext.hpp \
 #                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp \
 #                    tokenizer.hpp configfile.hpp configfile.cpp file.hpp \
-#                    errno.hpp errno.cpp
+#                    errno.hpp errno.cpp dynamiclibrary.hpp
 #else
   libmrw_la_SOURCES = \
                     mrw.hpp version.cpp \
@@ -116,7 +120,7 @@ endif
                     smartpointer.hpp stdext.cpp stdext.hpp \
                     string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp \
 		    tokenizer.hpp configfile.hpp configfile.cpp file.hpp \
-		    errno.hpp errno.cpp
+		    errno.hpp errno.cpp dynamiclibrary.hpp
 #endif
 if HAVE_STACKTRACE
 #if TRACER
@@ -128,6 +132,7 @@ if HAVE_STACKTRACE
 #endif
 endif
 libmrw_la_LDFLAGS = -version-info @LIB_VERSION@
+libmrw_la_LIBADD = -lltdl
 
 #if TRACER
 #  BUILT_SOURCES = ${tmp_src:.cpp=.ii}
@@ -147,7 +152,7 @@ endif
 endif
 
 check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test regexp_test \
-                 tokenizer_test configfile_test
+                 tokenizer_test configfile_test dynamiclibrary_test
 check_SCRIPTS = configfile_check.sh
 if HAVE_STACKTRACE
   check_PROGRAMS += stacktrace_test mrwexcstderr_test
@@ -156,66 +161,76 @@ if HAVE_LOG4CXX
 endif
 endif
 auto_test_SOURCES = auto_test.cpp version.cpp
-auto_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+auto_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 auto_test_LDFLAGS = @CPPUNIT_LIBS@
 auto_test_LDADD = -lmrw
 if HAVE_STACKTRACE
  auto_test_LDADD += -lmrwexcstderr
 endif
 smartpointer_test_SOURCES = smartpointer_test.cpp version.cpp
-smartpointer_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+smartpointer_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 smartpointer_test_LDFLAGS = @CPPUNIT_LIBS@
 smartpointer_test_LDADD = -lmrw
 if HAVE_STACKTRACE
  smartpointer_test_LDADD += -lmrwexcstderr
 endif
 exec_test_SOURCES = exec_test.cpp version.cpp
-exec_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+exec_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 exec_test_LDFLAGS = @CPPUNIT_LIBS@
 exec_test_LDADD = -lmrw
 if HAVE_STACKTRACE
  exec_test_LDADD += -lmrwexcstderr
 endif
 stdext_test_SOURCES = stdext_test.cpp version.cpp
-stdext_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+stdext_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 stdext_test_LDFLAGS = @CPPUNIT_LIBS@
 stdext_test_LDADD = -lmrw
 if HAVE_STACKTRACE
  stdext_test_LDADD += -lmrwexcstderr
 endif
 regexp_test_SOURCES = regexp_test.cpp version.cpp
-regexp_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+regexp_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 regexp_test_LDFLAGS = @CPPUNIT_LIBS@
 regexp_test_LDADD = -lmrw
 if HAVE_STACKTRACE
  regexp_test_LDADD += -lmrwexcstderr
 endif
 tokenizer_test_SOURCES = tokenizer_test.cpp version.cpp
-tokenizer_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+tokenizer_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 tokenizer_test_LDFLAGS = @CPPUNIT_LIBS@
 tokenizer_test_LDADD = -lmrw
 if HAVE_STACKTRACE
  tokenizer_test_LDADD += -lmrwexcstderr
 endif
 configfile_test_SOURCES = configfile_test.cpp version.cpp
-configfile_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+configfile_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
 configfile_test_LDFLAGS = @CPPUNIT_LIBS@
 configfile_test_LDADD = -lmrw
 if HAVE_STACKTRACE
  configfile_test_LDADD += -lmrwexcstderr
 endif
+check_LTLIBRARIES = libdynamiclibrary_testlib.la
+libdynamiclibrary_testlib_la_SOURCES = dynamiclibrary_testlib.cpp
+libdynamiclibrary_testlib_la_LDFLAGS = -module -rpath /bullshit
+dynamiclibrary_test_SOURCES = dynamiclibrary_test.cpp version.cpp
+dynamiclibrary_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
+dynamiclibrary_test_LDFLAGS = @CPPUNIT_LIBS@
+dynamiclibrary_test_LDADD = -lmrw -lltdl
+if HAVE_STACKTRACE
+ dynamiclibrary_test_LDADD += -lmrwexcstderr
+endif
 if HAVE_STACKTRACE
   stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp
-  stacktrace_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+  stacktrace_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
   stacktrace_test_LDFLAGS = @CPPUNIT_LIBS@
   stacktrace_test_LDADD = -lmrw -lmrwexcstderr
   mrwexcstderr_test_SOURCES = mrwexcstderr_test.cpp version.cpp
-  mrwexcstderr_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+  mrwexcstderr_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
   mrwexcstderr_test_LDFLAGS = @CPPUNIT_LIBS@
   mrwexcstderr_test_LDADD = -lmrwexcstderr
 if HAVE_LOG4CXX
     mrwexclog4cxx_test_SOURCES = mrwexclog4cxx_test.cpp version.cpp
-    mrwexclog4cxx_test_CPPFLAGS = -I.. -g3 @CPPUNIT_CFLAGS@
+    mrwexclog4cxx_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@
     mrwexclog4cxx_test_LDFLAGS = @CPPUNIT_LIBS@
     mrwexclog4cxx_test_LDADD = -lmrwexclog4cxx -llog4cxx
 endif