- more fixes

Changed files:
    cyrus-sasl-ac-libs.patch -> 1.2

diff --git a/cyrus-sasl-ac-libs.patch b/cyrus-sasl-ac-libs.patch
index 929c9e47c4befe7894bbb6598a70f689bc99ff66..7a734939a511f2cf6c7d59b8a1855ff9542a3186 100644 (file)
--- a/cyrus-sasl-ac-libs.patch
+++ b/cyrus-sasl-ac-libs.patch
@@ -1,5 +1,16 @@
 --- cyrus-sasl-2.1.23/configure.in.orig        2011-08-03 10:26:16.234418985 +0200
 +++ cyrus-sasl-2.1.23/configure.in     2011-08-03 10:37:21.689418838 +0200
+@@ -265,10 +265,6 @@
+       with_pam=$withval,
+       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
+   AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
+   cmu_save_LIBS="$LIBS"
+   AC_CHECK_FUNC(pam_start, :, 
 @@ -461,8 +461,7 @@
                ;;
        *)
@@ -69,3 +80,31 @@
      AC_CHECK_HEADERS(ldap.h lber.h)
  
      if test $ac_cv_header_ldap_h = yes -a $ac_cv_header_lber_h = yes; then
+--- cyrus-sasl-2.1.23/cmulocal/ax_path_bdb.m4~ 2005-01-06 21:24:52.000000000 +0100
++++ cyrus-sasl-2.1.23/cmulocal/ax_path_bdb.m4  2011-08-03 10:49:59.141418659 +0200
+@@ -89,8 +89,6 @@
+        # Check for library
+        AX_PATH_BDB_NO_OPTIONS([$1], [ENVONLY], [
+          ax_path_bdb_ok=yes
+-         BDB_CPPFLAGS="-I$ax_path_bdb_INC"
+-         BDB_LDFLAGS="-L$ax_path_bdb_LIB"
+        ])
+      else
+        AC_MSG_RESULT([no])
+@@ -240,8 +238,6 @@
+       if test "$ax_compare_version" = "true" ; then
+         ax_path_bdb_no_options_ok=yes
+         BDB_LIBS="-ldb"
+-        BDB_CPPFLAGS="-I$ax_path_bdb_path_find_highest_DIR/include"
+-        BDB_LDFLAGS="-L$ax_path_bdb_path_find_highest_DIR/lib"
+         BDB_VERSION="$ax_path_bdb_path_find_highest_VERSION"
+       fi
+     fi
+@@ -337,7 +333,6 @@
+     LIBS="$LIBS -ldb"
+ 
+     ax_path_bdb_path_get_version_save_LDFLAGS="$LDFLAGS"
+-    LDFLAGS="-L$1/lib $LDFLAGS"
+ 
+     # Compile and run a program that compares the version defined in
+     # the header file with a version defined in the library function