--- cyrus-sasl-2.1.28/configure.ac.orig	2022-05-23 18:58:17.991069660 +0200
+++ cyrus-sasl-2.1.28/configure.ac	2022-05-23 19:03:29.906046539 +0200
@@ -96,9 +96,6 @@ AC_PROG_MAKE_SET
 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
@@ -430,8 +427,7 @@ if test "$otp" != no; then
 		;;
 	*)
 		if test -d $with_opie; then
-		  CPPFLAGS="${CPPFLAGS} -I${with_opie}/include -I${with_opie}/include/security"
-		  LDFLAGS="${LDFLAGS} -L${with_opie}/lib"
+		  CPPFLAGS="${CPPFLAGS} -I${with_opie}/include/security"
 		else
 		  with_opie="no"
 		fi
@@ -751,16 +747,6 @@ case "$with_mysql" in
      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
@@ -829,16 +815,6 @@ case "$with_pgsql" in
      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
@@ -898,11 +874,6 @@ case "$with_sqlite" in
     no) true;;
     notfound) AC_MSG_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"
@@ -952,11 +923,6 @@ case "$with_sqlite3" in
     no) true;;
     notfound) AC_MSG_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"
@@ -999,11 +965,6 @@ if test "$ldapdb" != no; then
     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