Index: configure.ac
===================================================================
--- configure.ac	(revision 3167)
+++ configure.ac	(working copy)
@@ -163,16 +163,8 @@
 fi
 AC_SUBST(INSTALL_LDNS_CONFIG)
 
-# add option to disable the evil rpath
-dnl Check whether to use rpath or not
-AC_ARG_ENABLE(rpath,
-        [  --disable-rpath                disable hardcoded rpath (default=enabled)],
-	enable_rpath=$enableval, enable_rpath=yes)
+ACX_ARG_RPATH
 
-if test "x$enable_rpath" = xyes; then
-    RPATH_VAL="-Wl,-rpath=\${libdir}"
-fi
-
 #AC_TRY_RUN(
 #[
 #int main()