diff --git a/makefile.am b/makefile.am
index e381357..dac1e48 100644
--- a/makefile.am
+++ b/makefile.am
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.21  2005/02/28 08:11:46  marc
+## stack trace and dynamic library are conditional
+##
 ## Revision 1.20  2005/02/28 07:54:57  marc
 ## added functiontrace
 ##
@@ -77,12 +80,16 @@ nobase_include_HEADERS = mrw/arg.hpp        mrw/list.hpp \
                          mrw/auto.hpp       mrw/map.hpp \
 			 mrw/smartpointer.hpp  mrw/vector.hpp \
                          mrw/deque.hpp      mrw/multimap.hpp \
-			 mrw/stacktrace.hpp \
                          mrw/exception.hpp  mrw/multiset.hpp  mrw/stdext.hpp \
                          mrw/exec.hpp       mrw/set.hpp       mrw/string.hpp \
 			 mrw/regexp.hpp     mrw/tokenizer.hpp \
-			 mrw/configfile.hpp mrw/file.hpp      mrw/errno.hpp \
-			 mrw/dynamiclibrary.hpp 
+			 mrw/configfile.hpp mrw/file.hpp      mrw/errno.hpp
+if HAVE_STACKTRACE
+  nobase_include_HEADERS += mrw/stacktrace.hpp
+endif
+if HAVE_LTDL
+  nobase_include_HEADERS += mrw/dynamiclibrary.hpp
+endif
 if HAVE_LOG4CXX
   nobase_include_HEADERS += mrw/functiontrace.hpp
 endif