diff -Naur cyrus-sasl-2.1.25/configure.in cyrus-sasl-2.1.25.oden/configure.in
--- cyrus-sasl-2.1.25/configure.ac	2011-10-14 14:01:19.199460782 -0400
+++ cyrus-sasl-2.1.25.oden/configure.ac	2011-10-14 14:00:47.549456778 -0400
@@ -92,9 +92,6 @@
 AC_PROG_INSTALL
 AC_USE_SYSTEM_EXTENSIONS
 
-dnl check for -R, etc. switch
-CMU_GUESS_RUNPATH_SWITCH
-
 dnl xxx compatibility
 AC_ARG_WITH(staticsasl)
 if test "$with_staticsasl" = yes; then
@@ -271,10 +268,6 @@
 AC_ARG_WITH(pam, AC_HELP_STRING([--with-pam=DIR], [use PAM (rooted in DIR) [yes]]),,
 	with_pam=yes)
 if test "$with_pam" != no; then
-  if test -d $with_pam; then
-    CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
-    LDFLAGS="$LDFLAGS -L${with_pam}/lib"
-  fi
   cmu_save_LIBS="$LIBS"
   AC_CHECK_LIB(pam, pam_start, [
   AC_CHECK_HEADER(security/pam_appl.h,,
@@ -728,16 +721,6 @@
      LDFLAGS=$save_LDFLAGS
      ;;
     *)
-     if test -d ${with_mysql}/lib/mysql; then
-	CMU_ADD_LIBPATH_TO(${with_mysql}/lib/mysql, LIB_MYSQL)
-     elif test -d ${with_mysql}/mysql/lib; then
-	CMU_ADD_LIBPATH_TO(${with_mysql}/mysql/lib, LIB_MYSQL)
-     elif test -d ${with_mysql}/lib; then
-	CMU_ADD_LIBPATH_TO(${with_mysql}/lib, LIB_MYSQL)
-     else
-	CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
-     fi
-
      SASL_MECHS="$SASL_MECHS libmysql.la"
      SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o"
      LIB_MYSQL_DIR=$LIB_MYSQL
@@ -794,16 +777,6 @@
      LDFLAGS=$save_LDFLAGS
      ;;
     *)
-     if test -d ${with_pgsql}/lib/pgsql; then
-	CMU_ADD_LIBPATH_TO(${with_pgsql}/lib/pgsql, LIB_PGSQL)
-     elif test -d ${with_pgsql}/pgsql/lib; then
-	CMU_ADD_LIBPATH_TO(${with_pgsql}/pgsql/lib, LIB_PGSQL)
-     elif test -d ${with_pgsql}/lib; then
-	CMU_ADD_LIBPATH_TO(${with_pgsql}/lib, LIB_PGSQL)
-     else
-	CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
-     fi
-
      SASL_MECHS="$SASL_MECHS libpgsql.la"
      SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o"
      LIB_PGSQL_DIR=$LIB_PGSQL
@@ -861,12 +834,6 @@
     no) true;;
     notfound) AC_WARN([SQLite Library not found]); true;;
     *)
-     if test -d ${with_sqlite}/lib; then
-         CMU_ADD_LIBPATH_TO(${with_sqlite}/lib, LIB_SQLITE)
-     else
-         CMU_ADD_LIBPATH_TO(${with_sqlite}, LIB_SQLITE)
-     fi
-
      SASL_MECHS="$SASL_MECHS libsqlite.la"
      SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o"
      LIB_SQLITE_DIR=$LIB_SQLITE
@@ -915,12 +882,6 @@
     no) true;;
     notfound) AC_WARN([SQLite3 Library not found]); true;;
     *)
-     if test -d ${with_sqlite3}/lib; then
-         CMU_ADD_LIBPATH_TO(${with_sqlite3}/lib, LIB_SQLITE3)
-     else
-         CMU_ADD_LIBPATH_TO(${with_sqlite3}, LIB_SQLITE3)
-     fi
-
      SASL_MECHS="$SASL_MECHS libsqlite3.la"
      SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o"
      LIB_SQLITE3_DIR=$LIB_SQLITE3
@@ -962,11 +923,6 @@
     save_CPPFLAGS=$CPPFLAGS
     save_LDFLAGS=$LDFLAGS
 
-    if test -d $with_ldap; then
-        CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include"
-        CMU_ADD_LIBPATH(${with_ldap}/lib)
-    fi
-
     AC_CHECK_HEADERS(ldap.h lber.h)
 
     if test $ac_cv_header_ldap_h = yes -a $ac_cv_header_lber_h = yes; then
diff -Naur cyrus-sasl-2.1.25/saslauthd/configure.in cyrus-sasl-2.1.25.oden/saslauthd/configure.in
--- cyrus-sasl-2.1.25/configure.ac	2011-09-02 11:37:30.000000000 -0400
+++ cyrus-sasl-2.1.25.oden/configure.ac	2011-10-14 14:00:47.549456778 -0400
@@ -131,11 +126,6 @@
 	with_ldap=no)
 AC_MSG_RESULT($with_ldap)
 
-if test -d $with_ldap; then
-    CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
-    CMU_ADD_LIBPATH(${with_ldap}/lib)
-fi
-
 LDAP_LIBS=""
 if test "$with_ldap" != no; then
   AC_CHECK_LIB(ldap, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?])