b9abc1
diff -up cyrus-sasl-2.1.25/cmulocal/cyrus.m4.no_rpath cyrus-sasl-2.1.25/cmulocal/cyrus.m4
b9abc1
--- cyrus-sasl-2.1.25/cmulocal/cyrus.m4.no_rpath	2010-01-22 16:12:01.000000000 +0100
b9abc1
+++ cyrus-sasl-2.1.25/cmulocal/cyrus.m4	2012-12-06 14:59:47.956102057 +0100
b9abc1
@@ -32,14 +32,5 @@ AC_DEFUN([CMU_ADD_LIBPATH_TO], [
b9abc1
 dnl runpath initialization
b9abc1
 AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [
b9abc1
    # CMU GUESS RUNPATH SWITCH
b9abc1
-  AC_CACHE_CHECK(for runpath switch, andrew_cv_runpath_switch, [
b9abc1
-    # first, try -R
b9abc1
-    SAVE_LDFLAGS="${LDFLAGS}"
b9abc1
-    LDFLAGS="-R /usr/lib"
b9abc1
-    AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [
b9abc1
-  	LDFLAGS="-Wl,-rpath,/usr/lib"
b9abc1
-    AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-Wl,-rpath,"],
b9abc1
-    [andrew_cv_runpath_switch="none"])
b9abc1
-    ])
b9abc1
-  LDFLAGS="${SAVE_LDFLAGS}"
b9abc1
-  ])])
b9abc1
+    andrew_runpath_switch="none"
b9abc1
+  ])