]>
Commit | Line | Data |
---|---|---|
e937072c JR |
1 | --- cyrus-sasl-2.1.23/configure.in.orig 2011-08-03 10:26:16.234418985 +0200 |
2 | +++ cyrus-sasl-2.1.23/configure.in 2011-08-03 10:37:21.689418838 +0200 | |
43c3519c JR |
3 | @@ -86,9 +86,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 | |
6543a502 JR |
13 | @@ -265,10 +265,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, :, | |
e937072c JR |
24 | @@ -461,8 +461,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" | |
94f4c194 | 30 | + CPPFLAGS="${CPPFLAGS} -I${with_opie}/include/security" |
e937072c JR |
31 | else |
32 | with_opie="no" | |
33 | fi | |
34 | @@ -692,16 +691,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" | |
50 | LIB_MYSQL_DIR=$LIB_MYSQL | |
51 | @@ -758,16 +747,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" | |
67 | LIB_PGSQL_DIR=$LIB_PGSQL | |
68 | @@ -825,12 +804,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" | |
80 | LIB_SQLITE_DIR=$LIB_SQLITE | |
81 | @@ -872,11 +845,6 @@ | |
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 | |
6543a502 JR |
93 | --- cyrus-sasl-2.1.23/cmulocal/ax_path_bdb.m4~ 2005-01-06 21:24:52.000000000 +0100 |
94 | +++ cyrus-sasl-2.1.23/cmulocal/ax_path_bdb.m4 2011-08-03 10:49:59.141418659 +0200 | |
95 | @@ -89,8 +89,6 @@ | |
96 | # Check for library | |
97 | AX_PATH_BDB_NO_OPTIONS([$1], [ENVONLY], [ | |
98 | ax_path_bdb_ok=yes | |
99 | - BDB_CPPFLAGS="-I$ax_path_bdb_INC" | |
100 | - BDB_LDFLAGS="-L$ax_path_bdb_LIB" | |
101 | ]) | |
102 | else | |
103 | AC_MSG_RESULT([no]) | |
104 | @@ -240,8 +238,6 @@ | |
105 | if test "$ax_compare_version" = "true" ; then | |
106 | ax_path_bdb_no_options_ok=yes | |
107 | BDB_LIBS="-ldb" | |
108 | - BDB_CPPFLAGS="-I$ax_path_bdb_path_find_highest_DIR/include" | |
109 | - BDB_LDFLAGS="-L$ax_path_bdb_path_find_highest_DIR/lib" | |
110 | BDB_VERSION="$ax_path_bdb_path_find_highest_VERSION" | |
111 | fi | |
112 | fi | |
113 | @@ -337,7 +333,6 @@ | |
114 | LIBS="$LIBS -ldb" | |
115 | ||
116 | ax_path_bdb_path_get_version_save_LDFLAGS="$LDFLAGS" | |
117 | - LDFLAGS="-L$1/lib $LDFLAGS" | |
118 | ||
119 | # Compile and run a program that compares the version defined in | |
120 | # the header file with a version defined in the library function | |
43c3519c JR |
121 | --- cyrus-sasl-2.1.23/saslauthd/configure.in~ 2011-08-03 11:35:35.854770408 +0200 |
122 | +++ cyrus-sasl-2.1.23/saslauthd/configure.in 2011-08-03 11:37:56.047770375 +0200 | |
123 | @@ -28,7 +28,6 @@ | |
124 | ||
125 | dnl Checks for build foo | |
126 | CMU_C___ATTRIBUTE__ | |
127 | -CMU_GUESS_RUNPATH_SWITCH | |
128 | ||
129 | dnl Checks for libraries. | |
130 | CMU_SOCKETS | |
131 | @@ -92,10 +91,6 @@ | |
132 | with_pam=$withval, | |
133 | with_pam=yes) | |
134 | if test "$with_pam" != no; then | |
135 | - if test -d $with_pam; then | |
136 | - CPPFLAGS="$CPPFLAGS -I${with_pam}/include" | |
137 | - LDFLAGS="$LDFLAGS -L${with_pam}/lib" | |
138 | - fi | |
139 | cmu_save_LIBS="$LIBS" | |
140 | AC_CHECK_LIB(pam, pam_start, [ | |
141 | AC_CHECK_HEADER(security/pam_appl.h,, | |
142 | @@ -132,11 +127,6 @@ | |
143 | with_ldap=no) | |
144 | AC_MSG_RESULT($with_ldap) | |
145 | ||
146 | -if test -d $with_ldap; then | |
147 | - CPPFLAGS="$CPPFLAGS -I${with_ldap}/include" | |
148 | - CMU_ADD_LIBPATH(${with_ldap}/lib) | |
149 | -fi | |
150 | - | |
151 | LDAP_LIBS="" | |
152 | if test "$with_ldap" != no; then | |
153 | AC_CHECK_LIB(ldap, ldap_initialize, [ AC_DEFINE(HAVE_LDAP,[],[Support for LDAP?]) |