1 --- cyrus-sasl-2.1.25/configure.in.orig 2011-09-17 08:56:00.724155985 +0200
2 +++ cyrus-sasl-2.1.25/configure.in 2011-09-17 09:03:48.277504973 +0200
5 if test "$sql" != no; then
7 - SASL_MECHS="$SASL_MECHS libsql.la"
8 if test "$enable_static" = yes; then
9 - SASL_STATIC_SRCS="$SASL_STATIC_SRCS \$(top_srcdir)/plugins/sql.c"
10 - SASL_STATIC_OBJS="$SASL_STATIC_OBJS sql.o"
11 AC_DEFINE(STATIC_SQL,[],[Link SQL plugin staticly])
15 CMU_ADD_LIBPATH_TO(${with_mysql}, LIB_MYSQL)
18 + SASL_MECHS="$SASL_MECHS libmysql.la"
19 + SASL_STATIC_OBJS="$SASL_STATIC_OBJS mysql.o"
20 LIB_MYSQL_DIR=$LIB_MYSQL
21 LIB_MYSQL="$LIB_MYSQL -lmysqlclient"
24 CMU_ADD_LIBPATH_TO(${with_pgsql}, LIB_PGSQL)
27 + SASL_MECHS="$SASL_MECHS libpgsql.la"
28 + SASL_STATIC_OBJS="$SASL_STATIC_OBJS pgsql.o"
29 LIB_PGSQL_DIR=$LIB_PGSQL
30 LIB_PGSQL="$LIB_PGSQL -lpq"
33 LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
36 + SASL_MECHS="$SASL_MECHS libsqlite.la"
37 + SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite.o"
38 LIB_SQLITE_DIR=$LIB_SQLITE
39 LIB_SQLITE="$LIB_SQLITE -lsqlite"
42 LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
45 + SASL_MECHS="$SASL_MECHS libsqlite3.la"
46 + SASL_STATIC_OBJS="$SASL_STATIC_OBJS sqlite3.o"
47 LIB_SQLITE3_DIR=$LIB_SQLITE3
48 LIB_SQLITE3="$LIB_SQLITE3 -lsqlite3"
50 --- cyrus-sasl-2.1.25/plugins/Makefile.am.orig 2011-09-05 16:18:10.000000000 +0200
51 +++ cyrus-sasl-2.1.25/plugins/Makefile.am 2011-09-16 19:41:32.459226542 +0200
53 sasl_LTLIBRARIES = @SASL_MECHS@
54 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
55 libgs2.la libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
56 - libscram.la libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
57 + libscram.la libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la libsqlite.la libsqlite3.la libldapdb.la
59 libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
60 libplain_la_DEPENDENCIES = $(COMPAT_OBJS)
62 libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
63 libldapdb_la_LIBADD = $(LIB_LDAP) $(COMPAT_OBJS)
65 -libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
66 -libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) $(LIB_SQLITE3) \
68 -libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
69 -libsql_la_LIBADD = $(COMPAT_OBJS)
71 +libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
72 +libmysql_la_LDFLAGS = $(LIB_MYSQL) $(AM_LDFLAGS)
73 +libmysql_la_DEPENDENCIES = $(COMPAT_OBJS)
74 +libmysql_la_LIBADD = $(COMPAT_OBJS)
76 +libpgsql_la_SOURCES = pgsql.c pgsql_init.c $(common_sources)
77 +libpgsql_la_LDFLAGS = $(LIB_PGSQL) $(AM_LDFLAGS)
78 +libpgsql_la_DEPENDENCIES = $(COMPAT_OBJS)
79 +libpgsql_la_LIBADD = $(COMPAT_OBJS)
81 +libsqlite_la_SOURCES = sqlite.c sqlite_init.c $(common_sources)
82 +libsqlite_la_LDFLAGS = $(LIB_SQLITE) $(AM_LDFLAGS)
83 +libsqlite_la_DEPENDENCIES = $(COMPAT_OBJS)
84 +libsqlite_la_LIBADD = $(COMPAT_OBJS)
86 +libsqlite3_la_SOURCES = sqlite3.c sqlite3_init.c $(common_sources)
87 +libsqlite3_la_LDFLAGS = $(LIB_SQLITE3) $(AM_LDFLAGS)
88 +libsqlite3_la_DEPENDENCIES = $(COMPAT_OBJS)
89 +libsqlite3_la_LIBADD = $(COMPAT_OBJS)
92 + sed -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \
93 + -e 's#sql_auxprop_plug_init#mysql_auxprop_plug_init#g' \
97 + sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \
98 + -e 's#sql_auxprop_plug_init#pgsql_auxprop_plug_init#g' \
102 + sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE3#HAVE_NO_SQLITE3#g' \
103 + -e 's#sql_auxprop_plug_init#sqlite_auxprop_plug_init#g' \
107 + sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE$$#HAVE_NO_SQLITE#g' \
108 + -e 's#sql_auxprop_plug_init#sqlite3_auxprop_plug_init#g' \
111 # Instructions for making the _init files
113 init_src=anonymous_init.c crammd5_init.c digestmd5_init.c scram_init.c gs2_init.c gssapiv2_init.c \
114 kerberos4_init.c login_init.c plain_init.c srp_init.c otp_init.c ntlm_init.c \
115 -passdss_init.c sasldb_init.c sql_init.c ldapdb_init.c
116 +passdss_init.c sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c sqlite3_init.c ldapdb_init.c
119 CLEANFILES=$(init_src)
120 --- cyrus-sasl-2.1.25/plugins/makeinit.sh.orig 2011-05-11 21:25:55.000000000 +0200
121 +++ cyrus-sasl-2.1.25/plugins/makeinit.sh 2011-09-16 19:42:14.509227950 +0200
126 -for auxprop in sasldb sql ldapdb; do
127 +for auxprop in sasldb mysql pgsql sqlite sqlite3 ldapdb; do