From 043b61b2a5a30d5d45b15e9f8de7b72052225727 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Thu, 22 Apr 2010 23:01:31 +0200 Subject: Fix dependency checking for configure.h (v2) Alon Bar-Lev indicated commit f27bf509315a48b0070294c3993a718df0c2626c was missing proper dependency checking. This patch corrects this and fixes an issue when creating configure.h via make distcheck. This is an enhanced version of the one sent to the openvpn-devel mailing list April 13, 2010 [1], after having received some feedback from Gert Doering, cleaning up configure_log.awk further. [1] Signed-off-by: David Sommerseth Acked-by: Gert Doering --- Makefile.am | 10 +++++++--- configure_log.awk | 7 ++----- options.c | 2 ++ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3b858e2..fdc9def 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,7 +66,8 @@ dist_noinst_SCRIPTS = \ $(TESTS) \ doclean \ domake-win \ - t_cltsrv-down.sh + t_cltsrv-down.sh \ + configure_h.awk configure_log.awk dist_noinst_DATA = \ openvpn.spec \ @@ -142,9 +143,12 @@ openvpn_SOURCES = \ win32.h win32.c \ cryptoapi.h cryptoapi.c +nodist_openvpn_SOURCES = configure.h +options.$(OBJEXT): configure.h + configure.h: Makefile - awk -f configure_h.awk config.h > $@ - awk -f configure_log.awk config.log >> $@ + awk -f $(srcdir)/configure_h.awk config.h > $@ + awk -f $(srcdir)/configure_log.awk config.log >> $@ clean-local: -rm -f configure.h diff --git a/configure_log.awk b/configure_log.awk index b305f71..099e5c4 100644 --- a/configure_log.awk +++ b/configure_log.awk @@ -27,10 +27,7 @@ # ./config.log. # -BEGIN { - printf ("#define CONFIGURE_CALL \"") -} -/\$ .\/configure/ { - print $0,"\"" +/\$ (.*)\/configure/ { + printf ("#define CONFIGURE_CALL \"%s\"\n", $0) exit 0 } diff --git a/options.c b/options.c index 1f36089..a11425c 100644 --- a/options.c +++ b/options.c @@ -2921,7 +2921,9 @@ usage_version (void) msg (M_INFO|M_NOPREFIX, "%s", title_string); msg (M_INFO|M_NOPREFIX, "Originally developed by James Yonan"); msg (M_INFO|M_NOPREFIX, "Copyright (C) 2002-2010 OpenVPN Technologies, Inc. "); +#ifdef CONFIGURE_CALL msg (M_INFO|M_NOPREFIX, "\n%s\n", CONFIGURE_CALL); +#endif msg (M_INFO|M_NOPREFIX, "Compile time defines: %s", CONFIGURE_DEFINES); openvpn_exit (OPENVPN_EXIT_STATUS_USAGE); /* exit point */ } -- cgit v1.2.3