summaryrefslogtreecommitdiff
path: root/bootstrap.conf
diff options
context:
space:
mode:
authorAkim Demaille <akim@lrde.epita.fr>2012-07-31 11:50:18 +0200
committerAkim Demaille <akim@lrde.epita.fr>2012-07-31 12:03:55 +0200
commitcb9ec4fada480554cf47810fee736997d64e7427 (patch)
tree9f36a0c5ee15ad02df0bf70f1ef30d6471181341 /bootstrap.conf
parent84271837f686cc9bdf2d7483d4493f26b52d133d (diff)
parentaaf63e45b65d35bb506e431ffa8360f259ee393c (diff)
downloadbison-cb9ec4fada480554cf47810fee736997d64e7427.tar.gz
Merge branch 'maint'
* maint: use obstack_printf scanner: restore a missing start condition gnulib: update maint: post-release administrivia version 2.6.1 gnulib: update maint: fix some syntax-check issues tests: do not depend on __cplusplus to decide for C++ or C output Conflicts: NEWS bootstrap.conf cfg.mk lib/.gitignore
Diffstat (limited to 'bootstrap.conf')
-rw-r--r--bootstrap.conf5
1 files changed, 4 insertions, 1 deletions
diff --git a/bootstrap.conf b/bootstrap.conf
index 486268d7..e90cf12d 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -24,7 +24,10 @@ gnulib_modules='
gettext git-version-gen gitlog-to-changelog
gpl-3.0 hash inttypes isnan javacomp-script
javaexec-script ldexpl malloc-gnu
- mbswidth obstack perror progname
+ mbswidth
+ obstack
+ obstack-printf
+ perror progname
quote quotearg
readme-release
realloc-posix