]>
Commit | Line | Data |
---|---|---|
501f141c JB |
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 | |
43c3519c | 4 | AC_PROG_INSTALL |
5dd34792 | 5 | AC_USE_SYSTEM_EXTENSIONS |
43c3519c JR |
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 | |
501f141c | 13 | @@ -430,8 +427,7 @@ if test "$otp" != no; then |
e937072c JR |
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" | |
94f4c194 | 19 | + CPPFLAGS="${CPPFLAGS} -I${with_opie}/include/security" |
e937072c JR |
20 | else |
21 | with_opie="no" | |
22 | fi | |
501f141c | 23 | @@ -751,16 +747,6 @@ case "$with_mysql" in |
5dd34792 JB |
24 | LDFLAGS=$save_LDFLAGS |
25 | ;; | |
e937072c JR |
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" | |
e04db821 | 38 | SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o" |
e937072c | 39 | LIB_MYSQL_DIR=$LIB_MYSQL |
501f141c | 40 | @@ -829,16 +815,6 @@ case "$with_pgsql" in |
5dd34792 JB |
41 | LDFLAGS=$save_LDFLAGS |
42 | ;; | |
e937072c JR |
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" | |
e04db821 | 55 | SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o" |
e937072c | 56 | LIB_PGSQL_DIR=$LIB_PGSQL |
501f141c | 57 | @@ -898,11 +874,6 @@ case "$with_sqlite" in |
e937072c | 58 | no) true;; |
501f141c | 59 | notfound) AC_MSG_WARN(SQLite Library not found); true;; |
e937072c JR |
60 | *) |
61 | - if test -d ${with_sqlite}/lib; then | |
5dd34792 | 62 | - CMU_ADD_LIBPATH_TO(${with_sqlite}/lib, LIB_SQLITE) |
e937072c | 63 | - else |
5dd34792 | 64 | - CMU_ADD_LIBPATH_TO(${with_sqlite}, LIB_SQLITE) |
e937072c | 65 | - fi |
5dd34792 | 66 | |
e937072c | 67 | SASL_MECHS="$SASL_MECHS libsqlite.la" |
e04db821 | 68 | SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o" |
501f141c | 69 | @@ -952,11 +923,6 @@ case "$with_sqlite3" in |
e04db821 | 70 | no) true;; |
501f141c | 71 | notfound) AC_MSG_WARN(SQLite3 Library not found); true;; |
e04db821 JB |
72 | *) |
73 | - if test -d ${with_sqlite3}/lib; then | |
5dd34792 | 74 | - CMU_ADD_LIBPATH_TO(${with_sqlite3}/lib, LIB_SQLITE3) |
e04db821 | 75 | - else |
5dd34792 | 76 | - CMU_ADD_LIBPATH_TO(${with_sqlite3}, LIB_SQLITE3) |
e04db821 | 77 | - fi |
5dd34792 | 78 | |
e04db821 JB |
79 | SASL_MECHS="$SASL_MECHS libsqlite3.la" |
80 | SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o" | |
501f141c | 81 | @@ -999,11 +965,6 @@ if test "$ldapdb" != no; then |
e937072c JR |
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 |