diff --git a/makefile.am b/makefile.am
index 1922a0b..c1182d1 100644
--- a/makefile.am
+++ b/makefile.am
@@ -9,6 +9,9 @@
 ## @license LGPL, see file <a href="license.html">COPYING</a>
 ##
 ## $Log$
+## Revision 1.14  2004/12/14 20:22:42  marc
+## added regexp
+##
 ## Revision 1.13  2004/10/11 18:33:53  marc
 ## add stdext.hpp
 ##
@@ -49,11 +52,15 @@ SUBDIRS = mrw
 
 EXTRA_DIST = bootstrap.sh
 
-nobase_include_HEADERS = mrw/arg.hpp        mrw/list.hpp      mrw/simpletrace.hpp   mrw/unistd.hpp \
-                         mrw/auto.hpp       mrw/map.hpp       mrw/smartpointer.hpp  mrw/vector.hpp \
-                         mrw/deque.hpp      mrw/multimap.hpp  mrw/stacktrace.hpp \
+nobase_include_HEADERS = mrw/arg.hpp        mrw/list.hpp \
+                         mrw/simpletrace.hpp   mrw/unistd.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/exec.hpp       mrw/set.hpp       mrw/string.hpp \
+			 mrw/regexp.hpp
 infosdir = ${pkgdatadir}
 infos_DATA = AUTHORS NEWS README COPYING INSTALL ChangeLog \
              @PACKAGENAME@.spec
diff --git a/mrw/makefile.am b/mrw/makefile.am
index ffbf303..7735bec 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.15  2004/12/14 20:20:06  marc
+## added regexp
+##
 ## Revision 1.14  2004/12/08 13:48:20  marc
 ## forget TRACE
 ##
@@ -82,7 +85,7 @@ endif
 #                    map.hpp multimap.hpp multiset.hpp \
 #                    set.hpp simpletrace.hpp \
 #                    smartpointer.hpp stdext.cpp stdext.hpp \
-#                    string.hpp unistd.hpp vector.hpp
+#                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp
 #else
   libmrw_la_SOURCES = \
                     mrw.hpp version.cpp \
@@ -92,7 +95,7 @@ endif
                     map.hpp multimap.hpp multiset.hpp \
                     set.hpp simpletrace.hpp \
                     smartpointer.hpp stdext.cpp stdext.hpp \
-                    string.hpp unistd.hpp vector.hpp
+                    string.hpp unistd.hpp vector.hpp regexp.hpp regexp.cpp
 #endif
 if HAVE_STACKTRACE
 #if TRACER
@@ -122,7 +125,7 @@ if HAVE_LOG4CXX
 endif
 endif
 
-check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test
+check_PROGRAMS = auto_test smartpointer_test exec_test stdext_test regexp_test
 if HAVE_STACKTRACE
   check_PROGRAMS += stacktrace_test mrwexcstderr_test
 if HAVE_LOG4CXX
@@ -153,6 +156,12 @@ stdext_test_LDADD = -lmrw -lcppunit
 if HAVE_STACKTRACE
  stdext_test_LDADD += -lmrwexcstderr
 endif
+regexp_test_SOURCES = regexp_test.cpp version.cpp
+regexp_test_CPPFLAGS = -I.. -g3
+regexp_test_LDADD = -lmrw -lcppunit
+if HAVE_STACKTRACE
+ regexp_test_LDADD += -lmrwexcstderr
+endif
 if HAVE_STACKTRACE
   stacktrace_test_SOURCES = stacktrace_test.cpp version.cpp
   stacktrace_test_CPPFLAGS = -I.. -g3