--- milter-greylist-1.2.1/configure.ac.orig	Thu Apr 15 23:29:45 2004
+++ milter-greylist-1.2.1/configure.ac	Sat May  1 03:46:01 2004
@@ -3,7 +3,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(milter-greylist, 1.2.1, manu@netbsd.org)
+AC_INIT(milter-greylist, 1.2.1jel, manu@netbsd.org)
 AC_CONFIG_SRCDIR([milter-greylist.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -28,15 +28,20 @@
 LDFLAGS=$SAVEDLDFLAGS
 AC_MSG_RESULT([$ldrpath])
 
+# Sorry, but hardcoding pathes is not our policy. Admins know, how to tell
+# the system, which library pathes should be used (e.g. via ld.so.conf or
+# crle) and even know, how to set an LD_LIBRARY_PATH. So no rpathes, except
+# $ORIGIN and $ORIGIN/../lib are allowed ...
+
 # Path to required packages
 AC_ARG_WITH(libmilter, 
 	[  --with-libmilter=DIR   Find libmilter in DIR],
 	[CFLAGS=$CFLAGS" -I$withval/include" 
-	    LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"])
+	    LDFLAGS=$LDFLAGS" -L$withval/lib"])
 AC_ARG_WITH(libpthread, 
 	[  --with-libpthread=DIR  Find libpthread in DIR],
 	[CFLAGS=$CFLAGS" -I$withval/include" 
-	    LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"])
+	    LDFLAGS=$LDFLAGS" -L$withval/lib"])
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -61,7 +66,7 @@
 SAVEDCFLAGS=$CFLAGS
 AC_ARG_WITH(libspf_alt, 
 	[  --with-libspf_alt=DIR  Find libspf_alt in DIR],
-	[LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"
+	[LDFLAGS=$LDFLAGS" -L$withval/lib"
 	    CFLAGS=$CFLAGS" -I$withval/include"
 	    AC_CHECK_LIB(spf_alt, SPF_create_config, [
 		SAVEDLDFLAGS=$LDFLAGS
@@ -86,7 +91,7 @@
 SAVEDCFLAGS=$CFLAGS
 AC_ARG_WITH(libspf, 
 	[  --with-libspf=DIR  Find libspf in DIR],
-	[LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib"
+	[LDFLAGS=$LDFLAGS" -L$withval/lib"
 	    CFLAGS=$CFLAGS" -I$withval/include"
 	    AC_CHECK_LIB(spf, SPF_init, [
 		SAVEDLDFLAGS=$LDFLAGS
@@ -427,7 +432,7 @@
 	[CFLAGS=$CFLAGS" -DTIMEOUT=$withval"])
 AC_ARG_WITH(autowhite,  
 	[  --with-autowhite=VALUE How long auto-whitelisting lasts],
-	[CFLAGS=$CFLAGS" -DAUTOWHITE_DELAY=$withval"])
+	[CFLAGS=$CFLAGS" -DAUTOWHITE_VALIDITY=$withval"])
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT