1 diff -urN cyrus-sasl-2.1.20.org/configure.in cyrus-sasl-2.1.20/configure.in
2 --- cyrus-sasl-2.1.20.org/configure.in 2004-10-24 22:05:13.000000000 +0200
3 +++ cyrus-sasl-2.1.20/configure.in 2005-04-04 23:12:57.615789008 +0200
6 if test "$sql" != no; then
8 - SASL_MECHS="$SASL_MECHS libsql.la"
9 if test "$enable_static" = yes; then
10 - SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/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 diff -urN cyrus-sasl-2.1.20.org/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Makefile.am
42 --- cyrus-sasl-2.1.20.org/plugins/Makefile.am 2004-10-24 22:05:20.000000000 +0200
43 +++ cyrus-sasl-2.1.20/plugins/Makefile.am 2005-04-04 23:22:49.454815800 +0200
45 sasl_LTLIBRARIES = @SASL_MECHS@
46 EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
47 libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
48 - libntlm.la libsasldb.la libsql.la
49 + libntlm.la libsasldb.la libmysql.la libpgsql.la libsqlite.la
51 libplain_la_SOURCES = plain.c plain_init.c $(common_sources)
52 libplain_la_LDFLAGS = -version-info $(plain_version)
54 libsasldb_la_DEPENDENCIES = $(COMPAT_OBJS)
55 libsasldb_la_LIBADD = ../sasldb/libsasldb.la $(SASL_DB_LIB) $(COMPAT_OBJS)
57 -libsql_la_SOURCES = sql.c sql_init.c $(common_sources)
58 -libsql_la_LDFLAGS = $(LIB_MYSQL) $(LIB_PGSQL) $(LIB_SQLITE) -version-info $(sql_version)
59 -libsql_la_DEPENDENCIES = $(COMPAT_OBJS)
60 -libsql_la_LIBADD = $(COMPAT_OBJS)
62 +libmysql_la_SOURCES = mysql.c mysql_init.c $(common_sources)
63 +libmysql_la_LDFLAGS = $(LIB_MYSQL) -version-info $(sql_version)
64 +libmysql_la_DEPENDENCIES = $(COMPAT_OBJS)
65 +libmysql_la_LIBADD = $(COMPAT_OBJS)
67 +libpgsql_la_SOURCES = pgsql.c pgsql_init.c $(common_sources)
68 +libpgsql_la_LDFLAGS = $(LIB_PGSQL) -version-info $(sql_version)
69 +libpgsql_la_DEPENDENCIES = $(COMPAT_OBJS)
70 +libpgsql_la_LIBADD = $(COMPAT_OBJS)
72 +libsqlite_la_SOURCES = sqlite.c sqlite_init.c $(common_sources)
73 +libsqlite_la_LDFLAGS = $(LIB_SQLITE) -version-info $(sql_version)
74 +libsqlite_la_DEPENDENCIES = $(COMPAT_OBJS)
75 +libsqlite_la_LIBADD = $(COMPAT_OBJS)
78 + sed -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \
79 + -e 's#sql_auxprop_plug_init#mysql_auxprop_plug_init#g' \
83 + sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_SQLITE#HAVE_NO_SQLITE#g' \
84 + -e 's#sql_auxprop_plug_init#pgsql_auxprop_plug_init#g' \
88 + sed -e 's#HAVE_MYSQL#HAVE_NO_MYSQL#g' -e 's#HAVE_PGSQL#HAVE_NO_PGSQL#g' \
89 + -e 's#sql_auxprop_plug_init#sqlite_auxprop_plug_init#g' \
92 # Instructions for making the _init files
94 init_src=anonymous_init.c crammd5_init.c digestmd5_init.c gssapiv2_init.c \
95 kerberos4_init.c login_init.c plain_init.c srp_init.c otp_init.c ntlm_init.c \
96 -sasldb_init.c sql_init.c
97 +sasldb_init.c mysql_init.c pgsql_init.c sqlite_init.c
100 CLEANFILES=$(init_src)
101 diff -urN cyrus-sasl-2.1.20.org/plugins/makeinit.sh cyrus-sasl-2.1.20/plugins/makeinit.sh
102 --- cyrus-sasl-2.1.20.org/plugins/makeinit.sh 2003-07-15 19:38:59.000000000 +0200
103 +++ cyrus-sasl-2.1.20/plugins/makeinit.sh 2005-04-04 23:00:03.871750928 +0200
108 -for mech in sasldb sql ; do
109 +for mech in sasldb mysql pgsql sqlite ; do
113 --- cyrus-sasl-2.1.20/lib/Makefile.am.orig 2004-10-24 22:05:19.000000000 +0200
114 +++ cyrus-sasl-2.1.20/lib/Makefile.am 2005-05-14 10:44:12.000000000 +0200
116 if test $$k = $$j; then break; fi; done; \
117 if test $$k = foo; then deplibs="$$deplibs $$j"; fi ;; \
118 esac; done; dependency_libs=""; done; \
119 - sed -e "/^dependency_libs=/s%=.*%='$${depdirs}$${deplibs}'%" \
120 - libsasl2.la >TMP.$$ && mv TMP.$$ libsasl2.la