diff options
| -rw-r--r-- | bootstrap.conf | 4 | ||||
| -rw-r--r-- | build-aux/git-log-fix | 5 | ||||
| -rw-r--r-- | lib/.gitignore | 2 | ||||
| -rw-r--r-- | m4/.gitignore | 2 | ||||
| -rw-r--r-- | src/getargs.c | 2 |
5 files changed, 13 insertions, 2 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 165d5e7d..9dccd001 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -20,7 +20,9 @@ gnulib_modules=' argmatch assert calloc-posix close closeout config-h c-strcase configmake dirname - error extensions fdl fopen-safer getopt-gnu + error extensions fdl fopen-safer + getline + getopt-gnu gettext git-version-gen gitlog-to-changelog gpl-3.0 hash inttypes isnan javacomp-script javaexec-script ldexpl malloc-gnu mbschr mbsrchr diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix index af702fe6..72111507 100644 --- a/build-aux/git-log-fix +++ b/build-aux/git-log-fix @@ -1,3 +1,8 @@ # This file is expected to be used via gitlog-to-changelog's --amend=FILE # option. It specifies what changes to make to each given SHA1's commit # log and metadata, using Perl-eval'able expressions. + +0db2648930e3b6c376a539aabe368aade83ee29a +s/--flags/--feature/; +s/flag_flag/feature_flag/; +s/\bflag\b/feature/; diff --git a/lib/.gitignore b/lib/.gitignore index 15354476..2e92c2ff 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -278,3 +278,5 @@ /stdio.c /unistd.c /wctype-h.c +/getdelim.c +/getline.c diff --git a/m4/.gitignore b/m4/.gitignore index 7d112490..8b665097 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -180,3 +180,5 @@ /xstrndup.m4 /obstack-printf.m4 /extern-inline.m4 +/getdelim.m4 +/getline.m4 diff --git a/src/getargs.c b/src/getargs.c index c8865bfb..ab2a28e8 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -552,7 +552,7 @@ static struct option const long_options[] = /* Output. */ { "defines", optional_argument, 0, 'd' }, - { "flag", optional_argument, 0, 'f' }, + { "feature", optional_argument, 0, 'f' }, /* Operation modes. */ { "fixed-output-files", no_argument, 0, 'y' }, |