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