From 5de712175a7bf9cf60bbea0d0f4102abc347e608 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 31 Oct 2013 15:17:53 +0000
Subject: [PATCH] Fixup stdarg include, ldns reference in help.

git-svn-id: file:///svn/unbound/trunk@2999 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 config.h.in  | 4 ++++
 configure    | 4 ++--
 configure.ac | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/config.h.in b/config.h.in
index 9ae30fe68..17cf28bdf 100644
--- a/config.h.in
+++ b/config.h.in
@@ -706,6 +706,10 @@
 #include <stddef.h>
 #endif
 
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
diff --git a/configure b/configure
index 1f0868bc9..1d1b4b1b2 100755
--- a/configure
+++ b/configure
@@ -1475,7 +1475,7 @@ Optional Features:
   --disable-gost          Disable GOST support
   --disable-ecdsa         Disable ECDSA support
   --enable-static-exe     enable to compile executables statically against
-                          event, ldns libs, for debug purposes
+                          (event) libs, for debug purposes
   --enable-lock-checks    enable to check lock and unlock calls, for debug
                           purposes
   --enable-allsymbols     export all symbols from libunbound and link binaries
@@ -16954,7 +16954,7 @@ else
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 #include <openssl/conf.h>
-/* routine to load gost from ldns */
+/* routine to load gost (from ldns) */
 int load_gost_id(void)
 {
 	static int gost_id = 0;
diff --git a/configure.ac b/configure.ac
index bbbe77d22..017cd2ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -614,7 +614,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <openssl/evp.h>
 #include <openssl/engine.h>
 #include <openssl/conf.h>
-/* routine to load gost from ldns */
+/* routine to load gost (from ldns) */
 int load_gost_id(void)
 {
 	static int gost_id = 0;
@@ -849,7 +849,7 @@ AC_CHECK_HEADERS([expat.h],,, [AC_INCLUDES_DEFAULT])
 AC_SUBST(staticexe)
 staticexe=""
 AC_ARG_ENABLE(static-exe, AC_HELP_STRING([--enable-static-exe],
-	[ enable to compile executables statically against event, ldns libs, for debug purposes ]), 
+	[ enable to compile executables statically against (event) libs, for debug purposes ]), 
 	, )
 if test x_$enable_static_exe = x_yes; then
 	staticexe="-static"
@@ -1071,6 +1071,10 @@ dnl includes
 #include <stddef.h>
 #endif
 
+#ifdef HAVE_STDARG_H
+#include <stdarg.h>
+#endif
+
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-- 
2.47.2