From: David Sommerseth <davids@redhat.com>
Date: Wed, 11 Jan 2012 13:52:21 +0000 (+0100)
Subject: autotools ./configure don't like compat.h
X-Git-Tag: v2.3-alpha1~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=330baf2aee70b351cce2d138299118837adbe237;p=thirdparty%2Fopenvpn.git

autotools ./configure don't like compat.h

The compat.h include file cannot be loaded when ./configure runs,
as many of the HAVE_* declarations are not set.  This makes test
compilations when looking for features fail.

As ./configure will load syshead.h, it pulls in compat.h this way.
Looking more carefully at syshead.h, there's a #ifndef PACKAGE_NAME
check if config.h should be included.  This looks like a check if
syshead.h is loaded via ./configure or if it is a more normal
compilation.  Moving the compat.h inclusion into this #ifndef block.

Signed-off-by: David Sommerseth <davids@redhat.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/syshead.h b/syshead.h
index fba6f84ec..f1211142b 100644
--- a/syshead.h
+++ b/syshead.h
@@ -34,9 +34,9 @@
 #endif
 #ifndef PACKAGE_NAME
 #include "config.h"
+#include "compat.h"
 #endif
 
-#include "compat.h"
 
 /* branch prediction hints */
 #if defined(__GNUC__)