diff -Naur autofs-5.0.1/aclocal.m4 autofs-5.0.1-fix-hesiod-check/aclocal.m4
--- autofs-5.0.1/aclocal.m4	2006-07-13 10:11:38.000000000 +0200
+++ autofs-5.0.1-fix-hesiod-check/aclocal.m4	2006-08-23 15:29:28.000000000 +0200
@@ -178,7 +178,11 @@
 dnl --------------------------------------------------------------------------
 AC_DEFUN([AF_CHECK_LIBHESIOD],
 [AC_MSG_CHECKING(for libhesiod)
-LIBS="$LIBHESIOD -lhesiod -lresolv"
+
+# save current ldflags
+af_check_hesiod_save_ldflags="$LDFLAGS"
+LDFLAGS="$LDFLAGS -lhesiod -lresolv"
+
 AC_TRY_LINK(
   [ #include <hesiod.h> ],
   [ char *c; hesiod_init(&c); ],
@@ -186,5 +190,8 @@
     LIBHESIOD="$LIBHESIOD -lhesiod -lresolv"
     AC_MSG_RESULT(yes) ],
   [ AC_MSG_RESULT(no) ])
+
+# restore ldflags
+LDFLAGS="$af_check_hesiod_save_ldflags"
 ])