--- a/.hgignore	Sun Mar 07 14:51:10 2010 +0100
+++ b/.hgignore	Sun Mar 07 15:13:49 2010 +0100
@@ -20,6 +20,7 @@
 missing
 mkinstalldirs
 install-sh
+stamp-h1
 
 *.sw?
 cscope.out

--- a/autogen.sh	Sun Mar 07 14:51:10 2010 +0100
+++ b/autogen.sh	Sun Mar 07 15:13:49 2010 +0100
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 libtoolize --force --automake --copy
-aclocal
+aclocal -I macros/
 autoheader
 autoconf
 automake -a --copy

--- a/configure.ac	Sun Mar 07 14:51:10 2010 +0100
+++ b/configure.ac	Sun Mar 07 15:13:49 2010 +0100
@@ -68,8 +68,7 @@
                                   [g_list_append], ["$gmodule_module"])],
                  [g_regex_new "$gmodule_module"])
 
-# Export $libexecdir to the source tree
-AC_DEFINE_DIR(PKGLIB_DIR, "${libdir}/${PACKAGE}", [Modules directory])
+PKG_CHECK_MODULES(MCABBER, mcabber >= 0.10.0)
 
 AC_ARG_ENABLE(debug,
     [AC_HELP_STRING(--enable-debug, add development compilation options)],
@@ -92,6 +91,11 @@
 # We need _GNU_SOURCE for strptime() and strcasestr()
 CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
+AC_ARG_ENABLE(all-modules, [  --enable-all-modules    enable all modules],
+              enable_all_modules=$enableval)
+
+AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_all_modules = xyes])
+
 AC_CONFIG_FILES([comment/Makefile
                  extsay/Makefile
                  Makefile])

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/macros/define_dir.m4	Sun Mar 07 15:13:49 2010 +0100
@@ -0,0 +1,30 @@
+dnl define_dir.m4
+dnl http://autoconf-archive.cryp.to/ac_define_dir.html
+
+#  AC_DEFINE_DIR(VARNAME, DIR [, DESCRIPTION])
+# This macro sets VARNAME to the expansion of the DIR variable, taking care
+# of fixing up ${prefix} and such.
+# VARNAME is then offered as both an output variable and a C preprocessor
+# symbol.
+
+# Authors
+# Stepan Kasal <kasal@ucw.cz>, Andreas Schwab <schwab@suse.de>,
+# Guido Draheim <guidod@gmx.de>, Alexandre Oliva
+# (Slightly modified -- Mikael Berthe)
+
+AC_DEFUN([AC_DEFINE_DIR], [
+  prefix_NONE=
+  exec_prefix_NONE=
+  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
+  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
+dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
+dnl refers to ${prefix}.  Thus we have to use `eval' twice.
+  ac_define_dir=`eval echo [$]$2`
+  ac_define_dir=`eval echo [$]ac_define_dir`
+  AC_SUBST($1, "$ac_define_dir")
+  ifelse($3, ,
+    AC_DEFINE_UNQUOTED($1, "$ac_define_dir"),
+    AC_DEFINE_UNQUOTED($1, "$ac_define_dir", $3))
+  test "$prefix_NONE" && prefix=NONE
+  test "$exec_prefix_NONE" && exec_prefix=NONE
+])