www-cgi: Introduce `?DEFAULTS' pattern to match the default set.

[userv-utils] / ipif / udptunnel-vpn-config.m4

diff --git a/ipif/udptunnel-vpn-config.m4 b/ipif/udptunnel-vpn-config.m4
index ddf1de6..42eb390 100644 (file)
--- a/ipif/udptunnel-vpn-config.m4
+++ b/ipif/udptunnel-vpn-config.m4
@@ -1,5 +1,8 @@
 m4_dnl udptunnel-vpn-config.m4: macros for udptunnel-reconf et al
 
+m4_dnl Copyright (C) 1999-2000,2003 Ian Jackson
+m4_dnl This file is part of ipif, part of userv-utils
+
 m4_dnl This is free software; you can redistribute it and/or modify it
 m4_dnl under the terms of the GNU General Public License as published by
 m4_dnl the Free Software Foundation; either version 2 of the License, or
@@ -44,7 +47,6 @@ m4_divert(V_JUNK)
 
 V_YES
 m4_include(V_defaults)
-m4_include(V_global)
 
 V_WARGS(SITE, 1, [m4_ifelse([$1],V_site, [V_YES], [V_NO])])
 V_YES
@@ -56,6 +58,9 @@ V_ACTPA(PASSIVE)
 V_YES
 m4_include(V_tunnels)
 
+V_YES
+m4_include(V_global)
+
 m4_divert(V_VARIABLE)
 WHVARIABLE
 m4_divert(V_JUNK)