tests: sanitize PATH; do not discard mkswap output

[android-x86/external-parted.git] / bootstrap.conf

diff --git a/bootstrap.conf b/bootstrap.conf
index 91bbe6e..b4456b2 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2009 Free Software Foundation, Inc.
+# Copyright (C) 2006-2012 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
@@ -18,43 +18,58 @@
 
 # We don't need these modules.
 avoided_gnulib_modules='
-       --avoid=canonicalize-lgpl
        --avoid=dummy
-       --avoid=lock
-'
-
-# These modules are obsolete and can probably be removed soon,
-# but leave them in for now to minimize changes.
-obsolete_gnulib_modules='
-       atexit memchr memcmp memcpy memmove memset rename
-       strcspn strtod strtol utime
 '
 
 # gnulib modules used by this package.
 gnulib_modules="
-       $avoided_gnulib_modules
-       $obsolete_gnulib_modules
-       alloca announce-gen assert
-       calloc config-h configmake
-       closeout
-       fdl
-       gettext
-       git-version-gen
-        gitlog-to-changelog
-       gnumakefile
-       gnupload
-       inttypes
-       lib-ignore
-       long-options
-       malloc
-       mktempd
-       realloc
-       rpmatch
-       progname
-       safe-read
-       stdbool
-       useless-if-before-free
-       version-etc-fsf
+  $avoided_gnulib_modules
+  alloca
+  announce-gen
+  argmatch
+  assert
+  c-ctype
+  c-strcase
+  calloc-gnu
+  canonicalize-lgpl
+  close
+  closeout
+  config-h
+  configmake
+  dirname
+  do-release-commit-and-tag
+  fdl
+  fsync
+  gettext-h
+  git-version-gen
+  gitlog-to-changelog
+  gnu-web-doc-update
+  gnumakefile
+  gnupload
+  inttypes
+  lib-ignore
+  long-options
+  lseek
+  maintainer-makefile
+  malloc-gnu
+  manywarnings
+  mkstemp
+  mktempd
+  progname
+  realloc-gnu
+  rpmatch
+  safe-read
+  stdbool
+  strdup-posix
+  unlink
+  update-copyright
+  useless-if-before-free
+  usleep
+  vc-list-files
+  version-etc-fsf
+  warnings
+  xstrtol
+  xstrtoll
 "
 
 # Additional xgettext options to use.  Use "\\\newline" to break lines.
@@ -107,17 +122,20 @@ if test $gettext_external = 1; then
   '
 fi
 
-gnulib_tool_option_extras="--tests-base=$bt/gnulib-tests --with-tests"
+gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests --symlink\
+ --makefile-name=gnulib.mk
+"
 mkdir -p gnulib-tests
 
 # Build prerequisites
 buildreq="\
 autoconf   2.61
-automake   1.10a
+automake   1.11
 autopoint  -
+bc         -
 gettext    -
 git        1.4.4
-gperf      -
+gperf      3.0.3
 gzip       -
 makeinfo   -
 perl       5.5
@@ -125,8 +143,7 @@ rsync      -
 tar        -
 "
 
-# If there is no ChangeLog file, create it.
-if test -d .git; then
-  test -e ChangeLog ||
-    git log --pretty=medium | fold -s > ChangeLog
-fi
+# Automake requires that ChangeLog exist.
+touch ChangeLog || exit 1
+
+gnulib_name=libgnulib