X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=m4%2Fae_config_feature.m4;h=d34f5b50d9555f9be7b9a2e6fc43f55278bf224b;hb=HEAD;hp=7582c00f983dddbd22e90f55814b167429d5eb6b;hpb=86bc2ad861ba2a9108b83074f99698269799038e;p=urcu.git

diff --git a/m4/ae_config_feature.m4 b/m4/ae_config_feature.m4
index 7582c00..d34f5b5 100644
--- a/m4/ae_config_feature.m4
+++ b/m4/ae_config_feature.m4
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2020 Michael Jeanson <mjeanson@efficios.com>
+# SPDX-FileCopyrightText: 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
+#
+# SPDX-License-Identifier: GPL-2.0-or-later WITH LicenseRef-Autoconf-exception-macro
 #
 # SYNOPSIS
 #
@@ -63,39 +67,8 @@
 #   NOTE: AE_FEATURE_ENABLE/DISABLE() must be placed first of the relative
 #   AE_FEATURE() macro if you want the the proper ACTION-IF-ENABLED and
 #   ACTION-IF-NOT-ENABLED to run.
-#
-# LICENSE
-#
-#   Copyright (c) 2020 Michael Jeanson <mjeanson@efficios.com>
-#   Copyright (c) 2008 Francesco Salvestrini <salvestrini@users.sourceforge.net>
-#
-#   This program is free software; you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation; either version 2 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
 
-#serial 1
+#serial 3
 
 
 # AE_FEATURE_DEFAULT_ENABLE: The next feature defined with AE_FEATURE will
@@ -211,7 +184,7 @@ m4_pushdef([FEATURE], patsubst([$1], -, _))dnl
 ])
 
 
-dnl Disabled by default, unless already overriden
+dnl Disabled by default, unless already overridden
 m4_ifndef([ae_feature_default_arg],[AE_FEATURE_DEFAULT_DISABLE])
 
 
@@ -230,7 +203,7 @@ AS_IF([test "x$enable_[]FEATURE[]" = x && test "ae_feature_default_arg" = yes],[
 
 AC_ARG_ENABLE([$1],
   AS_HELP_STRING([--ae_feature_default_switch-$1],dnl
-                 [$2 [default=ae_feature_default_arg]]),[
+                 [$2]),[
 case "${enableval}" in
    yes)
      enable_[]FEATURE[]=yes