diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-03-06 09:35:46 +0100 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-03-06 09:35:46 +0100 |
| commit | 59e07285a8e195ac3951208824d93f265ff89259 (patch) | |
| tree | fd38dcd43f5b2e2a60fbc26198e2c36f33841f9b /m4 | |
| parent | f44f0aa604ce8480eb9fad34c045362e9add012b (diff) | |
| parent | 18546c2c50db17d55c81f863fe6482342c741307 (diff) | |
| download | automake-59e07285a8e195ac3951208824d93f265ff89259.tar.gz | |
Merge branch 'maint'
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/options.m4 | 9 | ||||
| -rw-r--r-- | m4/substnot.m4 | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/m4/options.m4 b/m4/options.m4 index 8e5017e8c..6824d84fa 100644 --- a/m4/options.m4 +++ b/m4/options.m4 @@ -1,12 +1,13 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -14,13 +15,13 @@ AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) diff --git a/m4/substnot.m4 b/m4/substnot.m4 index 811d28685..a4cbdf58c 100644 --- a/m4/substnot.m4 +++ b/m4/substnot.m4 @@ -1,11 +1,11 @@ ## -*- Autoconf -*- -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -14,6 +14,6 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |