Hello,
The following fixes a couple of minor bugs in build-aux/bootstrap. OK to
install?
Regards,
Sergey
2007-06-19 Sergey Poznyakoff <[EMAIL PROTECTED]>
* build-aux/bootstrap: Remove stray dot. Exit if
AC_CONFIG_AUX_DIR is not found in configure.ac.
Make sure build_aux settings are honored when linking
gnulib_extra_files
Index: build-aux/bootstrap
===================================================================
RCS file: /cvsroot/gnulib/gnulib/build-aux/bootstrap,v
retrieving revision 1.7
diff -p -u -r1.7 bootstrap
--- build-aux/bootstrap 13 Apr 2007 21:21:27 -0000 1.7
+++ build-aux/bootstrap 19 Jun 2007 18:08:32 -0000
@@ -103,6 +103,7 @@ gnulib_extra_files="
$build_aux/config.sub
doc/INSTALL
"
+
# Additional gnulib-tool options to use. Use "\newline" to break lines.
gnulib_tool_option_extras=
@@ -178,7 +179,8 @@ grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_a
>/dev/null && found_aux_dir=yes
if test $found_aux_dir = no; then
echo "$0: expected line not found in configure.ac. Add the following:" >&2
- echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2.
+ echo " AC_CONFIG_AUX_DIR([$build_aux])" >&2
+ exit 1
fi
# If $build_aux doesn't exist, create it now, otherwise some bits
@@ -508,11 +510,10 @@ done
# Get some extra files from gnulib, overriding existing files.
-
for file in $gnulib_extra_files; do
case $file in
*/INSTALL) dst=INSTALL;;
- *) dst=$file;;
+ *) dst=$build_aux/`expr $file : 'build-aux/\(.*\)'`;;
esac
symlink_to_gnulib $file $dst || exit
done
