diff --git a/mrw/makefile.am b/mrw/makefile.am
index 5627fcf..e40a7d6 100644
--- a/mrw/makefile.am
+++ b/mrw/makefile.am
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.24  2005/02/28 08:10:24  marc
+## dynamic library is conditional
+##
 ## Revision 1.23  2005/02/28 07:14:58  marc
 ## new functiontrace, removed simpletrace
 ##
@@ -124,7 +127,10 @@ 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 dynamiclibrary.hpp
+		    errno.hpp errno.cpp
+if HAVE_LTDL
+  libmrw_la_SOURCES += dynamiclibrary.hpp
+endif
 if HAVE_LOG4CXX
   libmrw_la_SOURCES += functiontrace.cpp functiontrace.hpp
 endif
@@ -161,7 +167,10 @@ endif
 endif
 
 check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test regexp_test \
-                 tokenizer_test configfile_test dynamiclibrary_test
+                 tokenizer_test configfile_test
+if HAVE_LTDL
+check_PROGRAMS += dynamiclibrary_test
+endif
 if HAVE_LOG4CXX
   check_PROGRAMS += functiontrace_test
 endif
@@ -221,13 +230,15 @@ 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_LTDL
+  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
+endif
 if HAVE_LOG4CXX
   functiontrace_test_SOURCES = functiontrace_test.cpp version.cpp
   functiontrace_test_CPPFLAGS = -I.. -g3 -O0 @CPPUNIT_CFLAGS@