TMP

modules/Makefile.am

@@ -1,4 +1,4 @@
-lib_LTLIBRARIES = libmod-layer-gnutls.la libmod-auth-gsasl.la libmod-users-sqlite3.la libmod-roster-sqlite3.la
+lib_LTLIBRARIES = libmod-layer-gnutls.la libmod-auth-gsasl.la libmod-users-sqlite3.la libmod-roster-sqlite3.la libmod-socket-tcpip.la
 libmod_layer_gnutls_la_SOURCES = layer-gnutls.c
 libmod_layer_gnutls_la_CPPFLAGS = -I ../src
 libmod_auth_gsasl_la_SOURCES = auth-gsasl.c
@@ -7,3 +7,5 @@ libmod_users_sqlite3_la_SOURCES = users-sqlite3.c
 libmod_users_sqlite3_la_CPPFLAGS = -I ../src
 libmod_roster_sqlite3_la_SOURCES = roster-sqlite3.c
 libmod_roster_sqlite3_la_CPPFLAGS = -I ../src
+libmod_socket_tcpip_la_SOURCES = socket-tcpip.c
+libmod_socket_tcpip_la_CPPFLAGS = -I ../src

modules/auth-gsasl.c

@@ -2,9 +2,18 @@
 
 int wxmppd_mod_auth_gsasl_load(funcptr *);
 
+char *wxmppd_mod_auth_gsasl_runtime_conflicts = {
+	"auth-cyrus-sasl",
+	NULL,
+};
+
 const wxmppd_module_data_t module_data = {
 	"auth-gsasl",
 	"GNU SASL authentication extension",
+	NULL,
+	NULL,
+	NULL,
+	&wxmppd_mod_auth_gsasl_runtime_conflicts,
 	(funcptr)wxmppd_mod_auth_gsasl_load,
 };
 

modules/layer-gnutls.c

@@ -2,9 +2,17 @@
 
 int wxmppd_mod_layer_gnutls_load(funcptr *);
 
+char *wxmppd_mod_layer_gnutls_runtime_conflicts[] = {
+	"layer-openssl",
+};
+
 const wxmppd_module_data_t module_data = {
 	"layer-gnutls",
 	"GnuTLS interface extension",
+	NULL,
+	NULL,
+	NULL,
+	&wxmppd_mod_layer_gnutls_runtime_conflicts,
 	(funcptr)wxmppd_mod_layer_gnutls_load,
 };
 

modules/roster-sqlite3.c

@@ -5,6 +5,10 @@ int wxmppd_mod_roster_sqlite3_load(funcptr *);
 const wxmppd_module_data_t module_data = {
 	"roster-sqlite3",
 	"SQLite3 storage module for roster data storage",
+	NULL,
+	NULL,
+	NULL,
+	NULL,
 	(funcptr)wxmppd_mod_roster_sqlite3_load,
 };
 

modules/users-sqlite3.c

@@ -5,6 +5,10 @@ int wxmppd_mod_users_sqlite3_load(funcptr *);
 const wxmppd_module_data_t module_data = {
 	"users-sqlite3",
 	"SQLite3 storage module for user data storage",
+	NULL,
+	NULL,
+	NULL,
+	NULL,
 	(funcptr)wxmppd_mod_users_sqlite3_load,
 };