--- a/mcabber/configure.ac	Sat May 27 00:05:17 2006 +0200
+++ b/mcabber/configure.ac	Sat May 27 12:51:19 2006 +0200
@@ -113,11 +113,9 @@
 
 AC_DEFINE(BUILD_JABBER, 1, [build with jabber support])
 
-AC_ARG_WITH(datadir,
-    [AC_HELP_STRING(--with-datadir, Read-only data (help files))],
-    datadir=$withval, datadir="")
-if test x"${datadir}" != x""; then
-    AC_DEFINE_UNQUOTED(DATA_DIR, "${datadir}", [Data files directory])
+# Export $datarootdir to the source tree.
+if test x"${datarootdir}" != x""; then
+    AC_DEFINE_UNQUOTED(DATA_ROOT_DIR, "${datarootdir}", [Data files directory])
 fi
 
 AC_ARG_ENABLE(debug,