From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 8 Sep 2011 17:17:47 +0000 (+0000)
Subject: More places to remove the experimental #if
X-Git-Tag: v8.11~472
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=aaa8a12d698b952df5fc3499a13e423119db2447

More places to remove the experimental #if
---

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 5c269cd4e..12d054fa2 100644
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -568,20 +568,13 @@ AC_CHECK_HEADER(libcitadel.h,
 CFLAGS="$saved_CFLAGS"
 
 
-dnl experimental libev smtp client remove this to...
-AC_DEFINE(EXPERIMENTAL_SMTP_EVENT_CLIENT, [], [should we use the experimental libevent smtp client?])
-dnl here...
-
-
-
-
-                AC_CHECK_LIB(cares, ares_init,
-                  [
+AC_CHECK_LIB(cares, ares_init,
+            [
                     C_ARES_LIBS=-lcares
-                AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
-                have_good_c_ares=yes
-                  ],, $SOCKET_LIBS $NSL_LIBS
-                )
+		    AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
+                    have_good_c_ares=yes
+            ],, $SOCKET_LIBS $NSL_LIBS
+)
 
 
 
diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c
index faf38b32f..06af61476 100644
--- a/citadel/modules/eventclient/serv_eventclient.c
+++ b/citadel/modules/eventclient/serv_eventclient.c
@@ -55,8 +55,6 @@
 
 #include "ctdl_module.h"
 
-#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
-
 #include "event_client.h"
 #include "serv_curl.h"
 
@@ -613,11 +611,8 @@ void *db_event_thread(void *arg)
 	return(NULL);
 }
 
-#endif
-
 CTDL_MODULE_INIT(event_client)
 {
-#ifdef EXPERIMENTAL_SMTP_EVENT_CLIENT
 	if (!threading)
 	{
 		InitEventQueue();
@@ -626,6 +621,5 @@ CTDL_MODULE_INIT(event_client)
 		CtdlThreadCreate(/*"DB event", */db_event_thread);
 /// todo register shutdown callback.
 	}
-#endif
 	return "event";
 }