Skip to contentSkip to conversation

Added check for variable CONFIGURE_DEFINES into options.c

PATCH Applied Samuli Seppänen 3 participants 3 messages Nov 12, 2010 – Nov 14, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Added check for variable CONFIGURE_DEFINES into options.c

From 327d6c66fff6962a96f86110dc91b1dad07ca224 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Samuli=20Sepp=C3=A4nen?= <[email protected]...>
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(-)
options.c +2 -0
index 717c5d7..29243f6 100644
@@ -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 */
 }
 
Signature · 1 line
1.6.3.3
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Samuli Seppänen
Quoted 1 line

From 327d6c66fff6962a96f86110dc91b1dad07ca224 Mon Sep 17 00:00:00 2001

From: =?utf-8?q?Samuli=20Sepp=C3=A4nen?= <[email protected]...>
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 on v1 1/1 Applied
#2 lore raw
In reply to Samuli Seppänen

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 1 line · Samuli Seppänen

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

commit 5682d3394204c788988b3cf67b3443a717704d2c

Author: Samuli Seppänen <[email protected]...>
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.

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-----