dnslookup: --enable-evdns arg to configure

diff --git a/configure.ac b/configure.ac
index ccc01a0cede5f3e4590f90138dc1f8cecc958a39..f6302e36b4eb0afec4536068c4c85a4b3e192f7c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -75,6 +75,17 @@ AC_CHECK_FUNCS(crypt lstat)
 dnl Find libevent
 AC_USUAL_LIBEVENT
 
+use_evdns=no
+AC_ARG_ENABLE(evdns, AC_HELP_STRING([--enable-evdns],[Use libevent for DNS lookups]),
+              [use_evdns=yes])
+AC_MSG_CHECKING([whether to use libevent for DNS lookups])
+if test "$use_evdns" = "yes"; then
+  AC_DEFINE(USE_EVDNS, 1, [Use libevent for DNS lookups.])
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+
 AC_USUAL_DEBUG
 AC_USUAL_CASSERT
 AC_USUAL_WERROR

diff --git a/include/dnslookup.h b/include/dnslookup.h
index 28459ffc8566a723dcd81158581c9c1a21469704..b497449da94de6b5ac890f7068b9af87fcdd60c5 100644 (file)
--- a/include/dnslookup.h
+++ b/include/dnslookup.h
@@ -16,24 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#if 1
-
-/* pick dns implementation */
-#ifdef EV_ET
-#define USE_LIBEVENT2
-#else
-#ifdef HAVE_GETADDRINFO_A
-#define USE_GETADDRINFO_A
-#else
-#define USE_LIBEVENT1
-#endif
-#endif
-
-#else
-#define USE_LIBEVENT2
-#endif
-
-
 struct DNSContext;
 struct DNSToken;
 

diff --git a/src/dnslookup.c b/src/dnslookup.c
index a639e8544f9c10ae1c8c2beaf813082161afbb2f..ac136a2f8670e38f7174e451ed2bdecc5a198b40 100644 (file)
--- a/src/dnslookup.c
+++ b/src/dnslookup.c
@@ -24,21 +24,30 @@
  * libevent2 - does not return TTL, uses hosts file.
  */
 
-#ifdef USE_GETADDRINFO_A
+#include <usual/netdb.h>
+
+#ifndef USE_EVDNS
+
 /* getaddrinfo_a */
-#include <netdb.h>
-#include <signal.h>
-#endif
+#define USE_GETADDRINFO_A
 
-#ifdef USE_LIBEVENT2
+#else
+
+#ifdef EV_ET
+
+/* libevent 2 */
+#define USE_LIBEVENT2
 #include <event2/dns.h>
 #define addrinfo evutil_addrinfo
 #define freeaddrinfo evutil_freeaddrinfo
-#endif
 
-#ifdef USE_LIBEVENT1
+#else
+
 /* libevent 1 */
+#define USE_LIBEVENT1
 #include <evdns.h>
+
+#endif
 #endif