tests: sanitize PATH; do not discard mkswap output

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

diff --git a/bootstrap.conf b/bootstrap.conf
index 773c6c5..b4456b2 100644 (file)
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2010 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
@@ -19,7 +19,6 @@
 # We don't need these modules.
 avoided_gnulib_modules='
        --avoid=dummy
-       --avoid=lock
 '
 
 # gnulib modules used by this package.
@@ -29,6 +28,8 @@ gnulib_modules="
   announce-gen
   argmatch
   assert
+  c-ctype
+  c-strcase
   calloc-gnu
   canonicalize-lgpl
   close
@@ -121,7 +122,9 @@ 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
@@ -129,6 +132,7 @@ buildreq="\
 autoconf   2.61
 automake   1.11
 autopoint  -
+bc         -
 gettext    -
 git        1.4.4
 gperf      3.0.3
@@ -139,10 +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