diff --git a/ChangeLog b/ChangeLog
index f189ca99..5bb2d108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-14  Stepan Kasal  <kasal@ucw.cz>
+
+	* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Remove a
+          mistaken comment: the path has to be relative; do not use
+	  the path at runtime.
+
 2006-09-13  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* lib/autoconf/status.m4 (_AC_OUTPUT_SUBDIRS): Quote the
@@ -13,8 +19,7 @@
 	* doc/autoconf.texi (Input): Clarify role of AC_CONFIG_MACRO_DIR.
 	* lib/autoconf/general.m4 (AC_CONFIG_MACRO_DIR): Do not check
 	for the existence of the directory at configure-time.  That's
-	too late, anyway, and possibly the directory isn't part of the
-	distribution.  Problem reported by Stefan Seefeld.
+	too late, anyway.  Problem reported by Stefan Seefeld.
 
 	* lib/m4sugar/m4sh.m4 (_AS_TEST_PREPARE): Avoid bug in UnixWare
 	7.1.4 /usr/bin/posix/sh described by Tim Rice in
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 05ecfe94..2b503c4a 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -1627,13 +1627,7 @@ AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 # AC_CONFIG_MACRO_DIR(DIR)
 # ------------------------
 # Declare directory containing additional macros for aclocal.
-# DIR can be either absolute or relative to $srcdir.
-AC_DEFUN([AC_CONFIG_MACRO_DIR],
-[case $1 in
-  [[\\/]]* | ?:[[\\/]]* ) ac_macro_dir=$1         ;;
-  *)                      ac_macro_dir=$srcdir/$1 ;;
-esac[]dnl
-])# AC_CONFIG_MACRO_DIR
+AC_DEFUN([AC_CONFIG_MACRO_DIR], [])