diff -Nurp autofs-5.0.1.orig/configure.in autofs-5.0.1/configure.in
--- autofs-5.0.1.orig/configure.in	2006-09-01 13:29:50.000000000 +0800
+++ autofs-5.0.1/configure.in	2007-10-18 20:21:12.000000000 +0800
@@ -276,7 +276,7 @@ AC_ARG_ENABLE(mount-locking,
 [  --disable-mount-locking disable use of locking when spawning mount command],,
 	enableval=yes)
 if test x$enable_mount_locking = xyes -o x$enableval = xyes; then
-	AC_DEFINE(ENABLE_MOUNT_LOCKING, 1)
+	AC_DEFINE(ENABLE_MOUNT_LOCKING, 1, [Disable use of locking when spawning mount command])
 fi
 
 #
@@ -287,7 +287,7 @@ AC_ARG_ENABLE(forced-shutdown,
 			  busy mounts during shutdown],,
 	enableval=no)
 if test x$enable_forced_shutdown = xyes -o x$enableval = xyes; then
-	AC_DEFINE(ENABLE_FORCED_SHUTDOWN, 1)
+	AC_DEFINE(ENABLE_FORCED_SHUTDOWN, 1, [Enable forced shutdown on USR1 signal])
 fi
 
 #
@@ -298,7 +298,7 @@ AC_ARG_ENABLE(ignore-busy,
 			  shutdown],,
 	enableval=no)
 if test x$enable_ignore_busy_mounts = xyes -o x$enableval = xyes; then
-	AC_DEFINE(ENABLE_IGNORE_BUSY_MOUNTS, 1)
+	AC_DEFINE(ENABLE_IGNORE_BUSY_MOUNTS, 1, [Enable exit, ignoring busy mounts])
 fi
 
 #
diff -Nurp autofs-5.0.1.orig/Makefile autofs-5.0.1/Makefile
--- autofs-5.0.1.orig/Makefile	2006-09-01 13:29:50.000000000 +0800
+++ autofs-5.0.1/Makefile	2007-10-18 20:21:12.000000000 +0800
@@ -52,6 +52,7 @@ backup: mrproper
 
 configure: configure.in aclocal.m4
 	autoconf
+	autoheader
 	rm -rf config.* *.cache
 
 configure.in: .version
diff -Nurp autofs-5.0.1.orig/Makefile.conf.in autofs-5.0.1/Makefile.conf.in
--- autofs-5.0.1.orig/Makefile.conf.in	2006-09-01 13:29:50.000000000 +0800
+++ autofs-5.0.1/Makefile.conf.in	2007-10-18 20:21:12.000000000 +0800
@@ -80,3 +80,5 @@ mandir = @mandir@
 # Location for init.d files
 initdir = @initdir@
 
+# This is here just to keep config.status quiet
+UNUSED_datarootdir = @datarootdir@