cyrus-sasl-ac-libs.patch

   1 --- cyrus-sasl-2.1.28/configure.ac.orig 2022-05-23 18:58:17.991069660 +0200
   2 +++ cyrus-sasl-2.1.28/configure.ac      2022-05-23 19:03:29.906046539 +0200
   3 @@ -96,9 +96,6 @@ AC_PROG_MAKE_SET
   4  AC_PROG_INSTALL
   5  AC_USE_SYSTEM_EXTENSIONS
   6
   7 -dnl check for -R, etc. switch
   8 -CMU_GUESS_RUNPATH_SWITCH
   9 -
  10  dnl xxx compatibility
  11  AC_ARG_WITH(staticsasl)
  12  if test "$with_staticsasl" = yes; then
  13 @@ -430,8 +427,7 @@ if test "$otp" != no; then
  14                 ;;
  15         *)
  16                 if test -d $with_opie; then
  17 -                 CPPFLAGS="${CPPFLAGS} -I${with_opie}/include -I${with_opie}/include/security"
  18 -                 LDFLAGS="${LDFLAGS} -L${with_opie}/lib"
  19 +                 CPPFLAGS="${CPPFLAGS} -I${with_opie}/include/security"
  20                 else
  21                   with_opie="no"
  22                 fi
  23 @@ -751,16 +747,6 @@ case "$with_mysql" in
  24       LDFLAGS=$save_LDFLAGS
  25       ;;
  26      *)
  27 -     if test -d ${with_mysql}/lib/mysql; then
  28 -       CMU_ADD_LIBPATH_TO(${with_mysql}/lib/mysql, LIB_MYSQL)
  29 -     elif test -d ${with_mysql}/mysql/lib; then
  30 -       CMU_ADD_LIBPATH_TO(${with_mysql}/mysql/lib, LIB_MYSQL)
  31 -     elif test -d ${with_mysql}/lib; then
  32 -       CMU_ADD_LIBPATH_TO(${with_mysql}/lib, LIB_MYSQL)
  33 -     else
  34 -       CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
  35 -     fi
  36 -
  37       SASL_MECHS="$SASL_MECHS libmysql.la"
  38       SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o"
  39       LIB_MYSQL_DIR=$LIB_MYSQL
  40 @@ -829,16 +815,6 @@ case "$with_pgsql" in
  41       LDFLAGS=$save_LDFLAGS
  42       ;;
  43      *)
  44 -     if test -d ${with_pgsql}/lib/pgsql; then
  45 -       CMU_ADD_LIBPATH_TO(${with_pgsql}/lib/pgsql, LIB_PGSQL)
  46 -     elif test -d ${with_pgsql}/pgsql/lib; then
  47 -       CMU_ADD_LIBPATH_TO(${with_pgsql}/pgsql/lib, LIB_PGSQL)
  48 -     elif test -d ${with_pgsql}/lib; then
  49 -       CMU_ADD_LIBPATH_TO(${with_pgsql}/lib, LIB_PGSQL)
  50 -     else
  51 -       CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
  52 -     fi
  53 -
  54       SASL_MECHS="$SASL_MECHS libpgsql.la"
  55       SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o"
  56       LIB_PGSQL_DIR=$LIB_PGSQL
  57 @@ -898,11 +874,6 @@ case "$with_sqlite" in
  58      no) true;;
  59      notfound) AC_MSG_WARN(SQLite Library not found); true;;
  60      *)
  61 -     if test -d ${with_sqlite}/lib; then
  62 -         CMU_ADD_LIBPATH_TO(${with_sqlite}/lib, LIB_SQLITE)
  63 -     else
  64 -         CMU_ADD_LIBPATH_TO(${with_sqlite}, LIB_SQLITE)
  65 -     fi
  66
  67       SASL_MECHS="$SASL_MECHS libsqlite.la"
  68       SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o"
  69 @@ -952,11 +923,6 @@ case "$with_sqlite3" in
  70      no) true;;
  71      notfound) AC_MSG_WARN(SQLite3 Library not found); true;;
  72      *)
  73 -     if test -d ${with_sqlite3}/lib; then
  74 -         CMU_ADD_LIBPATH_TO(${with_sqlite3}/lib, LIB_SQLITE3)
  75 -     else
  76 -         CMU_ADD_LIBPATH_TO(${with_sqlite3}, LIB_SQLITE3)
  77 -     fi
  78
  79       SASL_MECHS="$SASL_MECHS libsqlite3.la"
  80       SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o"
  81 @@ -999,11 +965,6 @@ if test "$ldapdb" != no; then
  82      save_CPPFLAGS=$CPPFLAGS
  83      save_LDFLAGS=$LDFLAGS
  84
  85 -    if test -d $with_ldap; then
  86 -        CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include"
  87 -        CMU_ADD_LIBPATH(${with_ldap}/lib)
  88 -    fi
  89 -
  90      AC_CHECK_HEADERS(ldap.h lber.h)
  91
  92      if test $ac_cv_header_ldap_h = yes -a $ac_cv_header_lber_h = yes; then