diff --git a/mrw/makefile.am b/mrw/makefile.am
index c07d96a..24e2a69 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.17  2005/01/07 00:33:51  marc
+## added config file and file
+##
 ## Revision 1.16  2004/12/17 16:30:06  marc
 ## added tokenizer
 ##
@@ -89,7 +92,7 @@ endif
 #                    set.hpp simpletrace.hpp \
 #                    smartpointer.hpp stdext.cpp stdext.hpp \
 #                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp \
-#                    tokenizer.hpp
+#                    tokenizer.hpp configfile.hpp configfile.cpp file.hpp
 #else
   libmrw_la_SOURCES = \
                     mrw.hpp version.cpp \
@@ -100,7 +103,7 @@ endif
                     set.hpp simpletrace.hpp \
                     smartpointer.hpp stdext.cpp stdext.hpp \
                     string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp \
-		    tokenizer.hpp
+		    tokenizer.hpp configfile.hpp configfile.cpp file.hpp
 #endif
 if HAVE_STACKTRACE
 #if TRACER
@@ -131,7 +134,8 @@ endif
 endif
 
 check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test regexp_test \
-                 tokenizer_test
+                 tokenizer_test configfile_test
+check_SCRIPTS = configfile_check.sh
 if HAVE_STACKTRACE
   check_PROGRAMS += stacktrace_test mrwexcstderr_test
 if HAVE_LOG4CXX
@@ -174,6 +178,12 @@ tokenizer_test_LDADD = -lmrw -lcppunit
 if HAVE_STACKTRACE
  tokenizer_test_LDADD += -lmrwexcstderr
 endif
+configfile_test_SOURCES = configfile_test.cpp version.cpp
+configfile_test_CPPFLAGS = -I.. -g3
+configfile_test_LDADD = -lmrw -lcppunit
+if HAVE_STACKTRACE
+ configfile_test_LDADD += -lmrwexcstderr
+endif
 if HAVE_STACKTRACE
   stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp
   stacktrace_test_CPPFLAGS = -I.. -g3
@@ -187,7 +197,7 @@ if HAVE_LOG4CXX
     mrwexclog4cxx_test_LDADD = -lmrwexclog4cxx -lcppunit -llog4cxx
 endif
 endif
-TESTS = ${check_PROGRAMS}
+TESTS = ${check_PROGRAMS} ${check_SCRIPTS}
 
 .PHONY: doc clean-local distclean-local