X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/bb8e56ff67d289d15f1a4dc7f5e1502cd3bbfc24..671850a1c3e1aaac93a89fabc6d810be6a4a77fe:/bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 190327d3..3bdf6c4a 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2015 Free Software Foundation, Inc.
 
 # 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
@@ -20,11 +20,13 @@ 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
+  getopt-gnu
   gettext git-version-gen gitlog-to-changelog
   gpl-3.0 hash inttypes isnan javacomp-script
   javaexec-script ldexpl malloc-gnu
   mbswidth
+  non-recursive-gnulib-prefix-hack
   obstack
   obstack-printf
   perror progname
@@ -32,7 +34,8 @@ gnulib_modules='
   readme-release
   realloc-posix
   spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
-  unistd unistd-safer unlocked-io update-copyright unsetenv verify
+  unistd unistd-safer unlink unlocked-io
+  update-copyright unsetenv verify
   warnings
   xalloc
   xalloc-die
@@ -49,7 +52,7 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --from-code=UTF-8\\\
  --flag=asprintf:2:c-format\\\
  --flag=complain:3:c-format\\\
- --flag=complain_at_indent:4:c-format\\\
+ --flag=complain_indent:4:c-format\\\
  --flag=unexpected_end:2:c-format\\\
 '
 XGETTEXT_OPTIONS_RUNTIME=$XGETTEXT_OPTIONS'\\\
@@ -78,7 +81,7 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
 bootstrap_post_import_hook()
 {
   # Massage lib/gnulib.mk before using it later in the bootstrapping process.
-  etc/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
+  build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
 
   # Ensure that ChangeLog exists, for automake.
   test -f ChangeLog || touch ChangeLog