Re: [Openvpn-devel] [PATCH] Added check for variable CONFIGURE_DEFINES into options.c

[David Sommerseth]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

On 12/11/10 16:57, Samuli Seppänen wrote:
>

Applied to the feat_misc branch, to be merged into allmerged and beta2.2.

commit 5682d3394204c788988b3cf67b3443a717704d2c
Author: Samuli Seppänen 
List-Post: openvpn-devel@lists.sourceforge.net
Date:   Fri Nov 12 17:30:07 2010 +0200

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 
Acked-by: Peter Stuge 
Signed-off-by: David Sommerseth 


kind regards,

David Sommerseth
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAkzgYV4ACgkQDC186MBRfrqvhgCgkOuHDMxSEy2hn6jjqqYfV68J
XjkAn0w+Ry7AlH/SoS+M1nRRHCMxl4y6
=EEdp
-END PGP SIGNATURE-

Re: [Openvpn-devel] [PATCH] Added check for variable CONFIGURE_DEFINES into options.c

[Peter Stuge]

Samuli Seppänen wrote:
> >From 327d6c66fff6962a96f86110dc91b1dad07ca224 Mon Sep 17 00:00:00 2001
> From: =?utf-8?q?Samuli=20Sepp=C3=A4nen?= 
> Date: Fri, 12 Nov 2010 17:30:07 +0200
> Subject: [PATCH] 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.

Acked-by: Peter Stuge 

[Openvpn-devel] [PATCH] Added check for variable CONFIGURE_DEFINES into options.c

[Samuli Seppänen]

>From 327d6c66fff6962a96f86110dc91b1dad07ca224 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Samuli=20Sepp=C3=A4nen?= 
List-Post: openvpn-devel@lists.sourceforge.net
Date: Fri, 12 Nov 2010 17:30:07 +0200
Subject: [PATCH] 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.
---
 options.c |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/options.c b/options.c
index 717c5d7..29243f6 100644
--- a/options.c
+++ b/options.c
@@ -2929,8 +2929,10 @@ 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 */
 }

-- 
1.6.3.3