cyrus-sasl-ac-libs.patch

   1 --- cyrus-sasl-2.1.25/configure.in.orig 2011-09-17 13:55:10.684757015 +0200
   2 +++ cyrus-sasl-2.1.25/configure.in      2011-09-17 14:01:04.321435523 +0200
   3 @@ -92,9 +92,6 @@
   4  AC_PROG_INSTALL
   5  CMU_C___ATTRIBUTE__
   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 @@ -271,10 +268,6 @@
  14         with_pam=$withval,
  15         with_pam=yes)
  16  if test "$with_pam" != no; then
  17 -  if test -d $with_pam; then
  18 -    CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
  19 -    LDFLAGS="$LDFLAGS -L${with_pam}/lib"
  20 -  fi
  21    AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
  22    cmu_save_LIBS="$LIBS"
  23    AC_CHECK_FUNC(pam_start, :,
  24 @@ -497,8 +490,7 @@
  25                 ;;
  26         *)
  27                 if test -d $with_opie; then
  28 -                 CPPFLAGS="${CPPFLAGS} -I${with_opie}/include -I${with_opie}/include/security"
  29 -                 LDFLAGS="${LDFLAGS} -L${with_opie}/lib"
  30 +                 CPPFLAGS="${CPPFLAGS} -I${with_opie}/include/security"
  31                 else
  32                   with_opie="no"
  33                 fi
  34 @@ -728,16 +720,6 @@
  35      no) true;;
  36      notfound) AC_WARN([MySQL Library not found]); true;;
  37      *)
  38 -     if test -d ${with_mysql}/lib/mysql; then
  39 -       CMU_ADD_LIBPATH_TO(${with_mysql}/lib/mysql, LIB_MYSQL)
  40 -     elif test -d ${with_mysql}/mysql/lib; then
  41 -       CMU_ADD_LIBPATH_TO(${with_mysql}/mysql/lib, LIB_MYSQL)
  42 -     elif test -d ${with_mysql}/lib; then
  43 -       CMU_ADD_LIBPATH_TO(${with_mysql}/lib, LIB_MYSQL)
  44 -     else
  45 -       CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
  46 -     fi
  47 -
  48       SASL_MECHS="$SASL_MECHS libmysql.la"
  49       SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o"
  50       LIB_MYSQL_DIR=$LIB_MYSQL
  51 @@ -794,16 +776,6 @@
  52      no) true;;
  53      notfound) AC_WARN([PostgreSQL Library not found]); true;;
  54      *)
  55 -     if test -d ${with_pgsql}/lib/pgsql; then
  56 -       CMU_ADD_LIBPATH_TO(${with_pgsql}/lib/pgsql, LIB_PGSQL)
  57 -     elif test -d ${with_pgsql}/pgsql/lib; then
  58 -       CMU_ADD_LIBPATH_TO(${with_pgsql}/pgsql/lib, LIB_PGSQL)
  59 -     elif test -d ${with_pgsql}/lib; then
  60 -       CMU_ADD_LIBPATH_TO(${with_pgsql}/lib, LIB_PGSQL)
  61 -     else
  62 -       CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
  63 -     fi
  64 -
  65       SASL_MECHS="$SASL_MECHS libpgsql.la"
  66       SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o"
  67       LIB_PGSQL_DIR=$LIB_PGSQL
  68 @@ -861,12 +833,6 @@
  69      no) true;;
  70      notfound) AC_WARN([SQLite Library not found]); true;;
  71      *)
  72 -     if test -d ${with_sqlite}/lib; then
  73 -         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
  74 -     else
  75 -         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
  76 -     fi
  77 -
  78       SASL_MECHS="$SASL_MECHS libsqlite.la"
  79       SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o"
  80       LIB_SQLITE_DIR=$LIB_SQLITE
  81 @@ -915,12 +881,6 @@
  82      no) true;;
  83      notfound) AC_WARN([SQLite3 Library not found]); true;;
  84      *)
  85 -     if test -d ${with_sqlite3}/lib; then
  86 -         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
  87 -     else
  88 -         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
  89 -     fi
  90 -
  91       SASL_MECHS="$SASL_MECHS libsqlite3.la"
  92       SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o"
  93       LIB_SQLITE3_DIR=$LIB_SQLITE3
  94 @@ -962,11 +922,6 @@
  95      save_CPPFLAGS=$CPPFLAGS
  96      save_LDFLAGS=$LDFLAGS
  97
  98 -    if test -d $with_ldap; then
  99 -        CPPFLAGS="${CPPFLAGS} -I${with_ldap}/include"
 100 -        CMU_ADD_LIBPATH(${with_ldap}/lib)
 101 -    fi
 102 -
 103      AC_CHECK_HEADERS(ldap.h lber.h)
 104
 105      if test $ac_cv_header_ldap_h = yes -a $ac_cv_header_lber_h = yes; then
 106 --- cyrus-sasl-2.1.23/cmulocal/ax_path_bdb.m4~  2005-01-06 21:24:52.000000000 +0100
 107 +++ cyrus-sasl-2.1.23/cmulocal/ax_path_bdb.m4   2011-08-03 10:49:59.141418659 +0200
 108 @@ -89,8 +89,6 @@
 109         # Check for library
 110         AX_PATH_BDB_NO_OPTIONS([$1], [ENVONLY], [
 111           ax_path_bdb_ok=yes
 112 -         BDB_CPPFLAGS="-I$ax_path_bdb_INC"
 113 -         BDB_LDFLAGS="-L$ax_path_bdb_LIB"
 114         ])
 115       else
 116         AC_MSG_RESULT([no])
 117 @@ -240,8 +238,6 @@
 118        if test "$ax_compare_version" = "true" ; then
 119          ax_path_bdb_no_options_ok=yes
 120          BDB_LIBS="-ldb"
 121 -        BDB_CPPFLAGS="-I$ax_path_bdb_path_find_highest_DIR/include"
 122 -        BDB_LDFLAGS="-L$ax_path_bdb_path_find_highest_DIR/lib"
 123          BDB_VERSION="$ax_path_bdb_path_find_highest_VERSION"
 124        fi
 125      fi
 126 @@ -337,7 +333,6 @@
 127      LIBS="$LIBS -ldb"
 128
 129      ax_path_bdb_path_get_version_save_LDFLAGS="$LDFLAGS"
 130 -    LDFLAGS="-L$1/lib $LDFLAGS"
 131
 132      # Compile and run a program that compares the version defined in
 133      # the header file with a version defined in the library function
 134 --- cyrus-sasl-2.1.23/saslauthd/configure.in~   2011-08-03 11:35:35.854770408 +0200
 135 +++ cyrus-sasl-2.1.23/saslauthd/configure.in    2011-08-03 11:37:56.047770375 +0200
 136 @@ -28,7 +28,6 @@
 137
 138  dnl Checks for build foo
 139  CMU_C___ATTRIBUTE__
 140 -CMU_GUESS_RUNPATH_SWITCH
 141
 142  dnl Checks for libraries.
 143  CMU_SOCKETS
 144 @@ -92,10 +91,6 @@
 145         with_pam=$withval,
 146         with_pam=yes)
 147  if test "$with_pam" != no; then
 148 -  if test -d $with_pam; then
 149 -    CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
 150 -    LDFLAGS="$LDFLAGS -L${with_pam}/lib"
 151 -  fi
 152    cmu_save_LIBS="$LIBS"
 153    AC_CHECK_LIB(pam, pam_start, [
 154           AC_CHECK_HEADER(security/pam_appl.h,,
 155 @@ -132,11 +127,6 @@
 156         with_ldap=no)
 157  AC_MSG_RESULT($with_ldap)
 158
 159 -if test -d $with_ldap; then
 160 -    CPPFLAGS="$CPPFLAGS -I${with_ldap}/include"
 161 -    CMU_ADD_LIBPATH(${with_ldap}/lib)
 162 -fi
 163 -
 164  LDAP_LIBS=""
 165  if test "$with_ldap" != no; then
 166    AC_CHECK_LIB(ldap, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?])