--- m4/cyrus.m4 2010-01-22 10:12:01.000000000 -0500 +++ m4/cyrus.m4.oden 2011-10-14 12:15:10.989456230 -0400 @@ -32,14 +32,5 @@ dnl runpath initialization AC_DEFUN([CMU_GUESS_RUNPATH_SWITCH], [ # CMU GUESS RUNPATH SWITCH - AC_CACHE_CHECK(for runpath switch, andrew_cv_runpath_switch, [ - # first, try -R - SAVE_LDFLAGS="${LDFLAGS}" - LDFLAGS="-R /usr/lib" - AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-R"], [ - LDFLAGS="-Wl,-rpath,/usr/lib" - AC_TRY_LINK([],[],[andrew_cv_runpath_switch="-Wl,-rpath,"], - [andrew_cv_runpath_switch="none"]) - ]) - LDFLAGS="${SAVE_LDFLAGS}" - ])]) + andrew_cv_runpath_switch="none" +])