1 --- cyrus-sasl-2.1.21/configure.in.orig 2005-05-20 23:27:03.114432120 +0200
2 +++ cyrus-sasl-2.1.21/configure.in 2005-05-20 23:45:10.826074816 +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 ../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"
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"
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"
38 LIB_SQLITE_DIR=$LIB_SQLITE
39 LIB_SQLITE="$LIB_SQLITE -lsqlite"
41 --- cyrus-sasl-2.1.21/plugins/Makefile.am.orig 2005-05-07 06:54:18.000000000 +0200
42 +++ cyrus-sasl-2.1.21/plugins/Makefile.am 2005-05-20 23:53:09.158357256 +0200
44 sasl_LTLIBRARIES = @SASL_MECHS@
45 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
46 libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
47 - libntlm.la libpassdss.la libsasldb.la libsql.la libldapdb.la
48 + libntlm.la libpassdss.la libsasldb.la libmysql.la libpgsql.la libsqlite.la libldapdb.la
50 libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
51 libplain_la_LDFLAGS = -version-info $(plain_version)
53 libldapdb_la_DEPENDENCIES = $(COMPAT_OBJS)
54 libldapdb_la_LIBADD = $(COMPAT_OBJS)
56 -libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
57 -libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
58 -libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
59 -libsql_la_LIBADD = $(COMPAT_OBJS)
61 +libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
62 +libmysql_la_LDFLAGS = $(LIB_MYSQL) -version-info $(sql_version)
63 +libmysql_la_DEPENDENCIES = $(COMPAT_OBJS)
64 +libmysql_la_LIBADD = $(COMPAT_OBJS)
66 +libpgsql_la_SOURCES = pgsql.c pgsql_init.c $(common_sources)
67 +libpgsql_la_LDFLAGS = $(LIB_PGSQL) -version-info $(sql_version)
68 +libpgsql_la_DEPENDENCIES = $(COMPAT_OBJS)
69 +libpgsql_la_LIBADD = $(COMPAT_OBJS)
71 +libsqlite_la_SOURCES = sqlite.c sqlite_init.c $(common_sources)
72 +libsqlite_la_LDFLAGS = $(LIB_SQLITE) -version-info $(sql_version)
73 +libsqlite_la_DEPENDENCIES = $(COMPAT_OBJS)
74 +libsqlite_la_LIBADD = $(COMPAT_OBJS)
77 + sed -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \
78 + -e 's#sql_auxprop_plug_init#mysql_auxprop_plug_init#g' \
82 + sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \
83 + -e 's#sql_auxprop_plug_init#pgsql_auxprop_plug_init#g' \
87 + sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' \
88 + -e 's#sql_auxprop_plug_init#sqlite_auxprop_plug_init#g' \
91 # Instructions for making the _init files
93 init_src=anonymous_init.c crammd5_init.c digestmd5_init.c gssapiv2_init.c \
94 kerberos4_init.c login_init.c plain_init.c srp_init.c otp_init.c ntlm_init.c \
95 -passdss_init.c sasldb_init.c sql_init.c ldapdb_init.c
96 +passdss_init.c sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c ldapdb_init.c
99 CLEANFILES=$(init_src)
100 --- cyrus-sasl-2.1.21/plugins/makeinit.sh.orig 2005-02-16 21:49:49.000000000 +0100
101 +++ cyrus-sasl-2.1.21/plugins/makeinit.sh 2005-05-20 23:53:28.019489928 +0200
106 -for mech in sasldb sql ldapdb; do
107 +for mech in sasldb mysql pgsql sqlite ldapdb; do