misc: require getline

* bootstrap.conf: Here, used by src/location.c.
* src/getargs.c (long_options): Rename --flags to --feature.

diff --git a/bootstrap.conf b/bootstrap.conf
index 165d5e7d84675cbae6edc6dd123b2ba74f8ed596..9dccd00144e3cf9b0af245f0c36c65f9416d3f42 100644 (file)
--- 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 af702fe6f0c9c433dd862f6185130e165ecd139e..72111507b3b9cd71a2316c5936a878987b85e26b 100644 (file)
--- 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 15354476e5f604ff5861116b24c9143ba3bf718c..2e92c2ffd8eb4ddaa510e6c99d1e447bc84f05f4 100644 (file)
--- 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 7d1124906728546d8b7446d71fe723cc9242e0d4..8b665097b182d45cfcb0889fff21c0e66e6badb7 100644 (file)
--- 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 c8865bfbd96d2e652b91cefc569b5e63c7076160..ab2a28e828739c44dd90381367f8dc7414556fd8 100644 (file)
--- 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' },