From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 24 Jan 2014 10:55:28 +0000 (+0000)
Subject: - unbound-event.h is installed if you configure --enable-event-api.
X-Git-Tag: release-1.4.22rc1~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a1e15776f305e4df90a83346155be8cd9090d25;p=thirdparty%2Funbound.git

- unbound-event.h is installed if you configure --enable-event-api.


git-svn-id: file:///svn/unbound/trunk@3047 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/configure b/configure
index 72f669044..1b3e61ba4 100755
--- a/configure
+++ b/configure
@@ -821,6 +821,7 @@ with_ssl
 enable_sha2
 enable_gost
 enable_ecdsa
+enable_event_api
 with_libevent
 with_libexpat
 enable_static_exe
@@ -1475,6 +1476,8 @@ Optional Features:
   --disable-sha2          Disable SHA256 and SHA512 RRSIG support
   --disable-gost          Disable GOST support
   --disable-ecdsa         Disable ECDSA support
+  --enable-event-api      Enable (experimental) libevent-based libunbound API
+                          installed to unbound-event.h
   --enable-static-exe     enable to compile executables statically against
                           (event) libs, for debug purposes
   --enable-lock-checks    enable to check lock and unlock calls, for debug
@@ -17145,6 +17148,20 @@ _ACEOF
       ;;
 esac
 
+# Check whether --enable-event-api was given.
+if test "${enable_event_api+set}" = set; then :
+  enableval=$enable_event_api;
+fi
+
+use_unbound_event="no"
+case "$enable_event_api" in
+    yes)
+      use_unbound_event="yes"
+      ;;
+    *)
+      ;;
+esac
+
 # check for libevent
 
 # Check whether --with-libevent was given.
@@ -17475,10 +17492,12 @@ done
 	if test -n "$BAK_LDFLAGS_SET"; then
 		LDFLAGS="$BAK_LDFLAGS"
 	fi
-	UNBOUND_EVENT_INSTALL=unbound-event-install
+        if test "$use_unbound_event" = "yes"; then
+		UNBOUND_EVENT_INSTALL=unbound-event-install
 
-	UNBOUND_EVENT_UNINSTALL=unbound-event-uninstall
+		UNBOUND_EVENT_UNINSTALL=unbound-event-uninstall
 
+	fi
 else
 
 $as_echo "#define USE_MINI_EVENT 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index 0fba9344f..e92836da4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -742,6 +742,16 @@ case "$enable_ecdsa" in
       ;;
 esac
 
+AC_ARG_ENABLE(event-api, AC_HELP_STRING([--enable-event-api], [Enable (experimental) libevent-based libunbound API installed to unbound-event.h]))
+use_unbound_event="no"
+case "$enable_event_api" in
+    yes)
+      use_unbound_event="yes"
+      ;;
+    *)
+      ;;
+esac
+
 # check for libevent
 AC_ARG_WITH(libevent, AC_HELP_STRING([--with-libevent=pathname],
     [use libevent (will check /usr/local /opt/local /usr/lib /usr/pkg /usr/sfw /usr  or you can specify an explicit path). Slower, but allows use of large outgoing port ranges.]),
@@ -816,8 +826,10 @@ large outgoing port ranges.  ])
 	if test -n "$BAK_LDFLAGS_SET"; then
 		LDFLAGS="$BAK_LDFLAGS"
 	fi
-	AC_SUBST(UNBOUND_EVENT_INSTALL, [unbound-event-install])
-	AC_SUBST(UNBOUND_EVENT_UNINSTALL, [unbound-event-uninstall])
+        if test "$use_unbound_event" = "yes"; then
+		AC_SUBST(UNBOUND_EVENT_INSTALL, [unbound-event-install])
+		AC_SUBST(UNBOUND_EVENT_UNINSTALL, [unbound-event-uninstall])
+	fi
 else
 	AC_DEFINE(USE_MINI_EVENT, 1, [Define if you want to use internal select based events])
 fi
diff --git a/doc/Changelog b/doc/Changelog
index 5b00149f3..1347b8f44 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 24 January 2014: Wouter
 	- Change unbound-event.h to use void* buffer, length idiom.
 	- iana portlist updated.
+	- unbound-event.h is installed if you configure --enable-event-api.
 
 21 January 2014: Wouter
 	- Fix #547: no trustanchor written if filesystem full, fclose checked.