--- autofs-4.1.4/aclocal.m4.original	2005-05-20 11:41:34 +0200
+++ autofs-4.1.4/aclocal.m4	2005-05-20 11:41:47 +0200
@@ -9,6 +9,8 @@
 AC_DEFUN(AF_PATH_INCLUDE,
 [AC_PATH_PROGS($1,$2,$3,$4)
 if test -n "$$1"; then
+  AH_TEMPLATE([HAVE_$1], [Have $2])
+  AH_TEMPLATE([PATH_$1], [Have $2])
   AC_DEFINE(HAVE_$1)
   AC_DEFINE_UNQUOTED(PATH_$1, "$$1")
   HAVE_$1=1
--- autofs-4.1.4/configure.in.original	2005-04-06 17:24:37 +0200
+++ autofs-4.1.4/configure.in	2005-05-20 11:40:46 +0200
@@ -134,12 +134,14 @@
 cat > pietest.c <<EOF
 int main(void) { return 0; }
 EOF
+AF_tmp_ldflags="$LDFLAGS"
+AF_tmp_cflags="$CFLAGS"
 CFLAGS=-fPIE
 LDFLAGS=-pie
 DAEMON_CFLAGS=
 DAEMON_LDFLAGS=
 AC_MSG_CHECKING([whether gcc -fPIE works])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])],
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])],
 	      [gcc_supports_pie=yes], [gcc_supports_pie=no])
 AC_MSG_RESULT([$gcc_supports_pie])
 if test $gcc_supports_pie = yes ; then
@@ -149,6 +151,8 @@
 rm -f pietest.c
 AC_SUBST(DAEMON_CFLAGS)
 AC_SUBST(DAEMON_LDFLAGS)
+CFLAGS="${AF_tmp_cflags}"
+LDFLAGS="${AF_tmp_ldflags}"
 
 #
 # Location of init.d directory?