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] <http://thread.gmane.org/gmane.network.openvpn.devel/3410/focus=3491>

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Acked-by: Gert Doering <gert@greenie.muc.de>

diff --git a/Makefile.am b/Makefile.am
index 20453d0ec48f8b2461071f7a42aea7cc76e1f173..f509a4b1aa5500bacd2b4e0bfda80d00b795f081 100644 (file)
--- 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 \
@@ -141,9 +142,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 b305f71e1428631547dff794ea201c59e017b82c..099e5c498c63dd2d76180e3db144cf70f110952c 100644 (file)
--- 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 25936d132416677894e8a29bbf20ad4f1962f44a..294ba58b7c8efa4d99cf31b0cd060684fd9ff768 100644 (file)
--- a/options.c
+++ b/options.c
@@ -2752,7 +2752,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-2009 OpenVPN Technologies, Inc. <sales@openvpn.net>");
+#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 */
 }