diff -Naur mod_highlight/autogen.sh mod_highlight.oden/autogen.sh
--- mod_highlight/autogen.sh	2006-03-20 22:14:46.000000000 +0100
+++ mod_highlight.oden/autogen.sh	2006-03-20 22:43:00.000000000 +0100
@@ -8,11 +8,3 @@
 automake --add-missing --copy --foreign
 autoconf
 rm -rf autom4te.cache
-cd colorer
-#libtoolize --force --copy
-aclocal
-autoheader
-automake --add-missing --copy --foreign
-autoconf
-rm -rf autom4te.cache
-
diff -Naur mod_highlight/configure.ac mod_highlight.oden/configure.ac
--- mod_highlight/configure.ac	2006-03-20 22:14:46.000000000 +0100
+++ mod_highlight.oden/configure.ac	2006-03-20 22:42:54.000000000 +0100
@@ -31,16 +31,6 @@
 AC_SUBST(MODULE_CFLAGS)
 
 prefix=${AP_PREFIX}
-AC_CONFIG_SUBDIRS(colorer)
-
-COLORER_DIR=colorer
-AC_SUBST(COLORER_DIR)
-
-COLORER_LDFLAGS="-L\$(top_builddir)/colorer/src/libcolorer -lcolorer"
-AC_SUBST(COLORER_LDFLAGS)
-
-COLORER_CFLAGS="-I\$(top_srcdir)/colorer/src/shared"
-AC_SUBST(COLORER_CFLAGS)
 
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_OUTPUT
diff -Naur mod_highlight/Makefile.am mod_highlight.oden/Makefile.am
--- mod_highlight/Makefile.am	2006-03-20 22:14:46.000000000 +0100
+++ mod_highlight.oden/Makefile.am	2006-03-20 22:42:54.000000000 +0100
@@ -6,7 +6,7 @@
 	TODO \
 	README
 
-SUBDIRS = @COLORER_DIR@ src
+SUBDIRS = src
 
 TODO: TODO.in
 	./gen_todo.pl
diff -Naur mod_highlight/src/Makefile.am mod_highlight.oden/src/Makefile.am
--- mod_highlight/src/Makefile.am	2006-03-20 22:14:46.000000000 +0100
+++ mod_highlight.oden/src/Makefile.am	2006-03-20 22:42:54.000000000 +0100
@@ -1,9 +1,9 @@
 CLEANFILES = .libs/libmod_highlight *~
 
 libmod_highlight_la_SOURCES = mod_highlight.c colorer_interface.cpp ChunkLineSource.cpp BucketWriter.cpp ColorerFilter.cpp
-libmod_highlight_la_CFLAGS = -Wall ${MODULE_CFLAGS} @COLORER_CFLAGS@
-libmod_highlight_la_CPPFLAGS = -Wall ${MODULE_CFLAGS} @COLORER_CFLAGS@
-libmod_highlight_la_LDFLAGS = @COLORER_LDFLAGS@
+libmod_highlight_la_CFLAGS = -Wall ${MODULE_CFLAGS} -I@includedir@/colorer
+libmod_highlight_la_CPPFLAGS = -Wall ${MODULE_CFLAGS} -I@includedir@/colorer
+libmod_highlight_la_LDFLAGS = -L@libdir@ -lcolorer
 
 lib_LTLIBRARIES = libmod_highlight.la