From: Samuli Seppänen <samuli@openvpn.net>
Date: Fri, 12 Nov 2010 15:30:07 +0000 (+0200)
Subject: Added check for variable CONFIGURE_DEFINES into options.c
X-Git-Tag: v2.2-beta4~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5682d3394204c788988b3cf67b3443a717704d2c;p=thirdparty%2Fopenvpn.git

Added check for variable CONFIGURE_DEFINES into options.c

The file containing CONFIGURE_DEFINES variable, configure.h, is not present if
openvpn is built using the Python + Visual C -based buildsystem. This causes the
build to fail. This patch adds a check to see if variable exists before trying
to use it.

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Peter Stuge <peter@stuge.se>
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
---

diff --git a/options.c b/options.c
index 15a1d62b1..8177732d4 100644
--- a/options.c
+++ b/options.c
@@ -2763,7 +2763,9 @@ usage_version (void)
 #ifdef CONFIGURE_CALL
   msg (M_INFO|M_NOPREFIX, "\n%s\n", CONFIGURE_CALL);
 #endif
+#ifdef CONFIGURE_DEFINES
   msg (M_INFO|M_NOPREFIX, "Compile time defines: %s", CONFIGURE_DEFINES);
+#endif
 #endif
   openvpn_exit (OPENVPN_EXIT_STATUS_USAGE); /* exit point */
 }