Add new test cases.

[chaz/tar] / bootstrap

diff --git a/bootstrap b/bootstrap
index 57307dff2fd0ef6f7a7cfed3a206b2ded6a831d5..c250cf05bdfb1854e6191d56b8aa4852d1b3296a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -266,7 +266,7 @@ copy_files ${PAXUTILS_SRCDIR}/m4 m4
 echo "$0: Creating m4/paxutils.m4"
 (echo "# This file is generated automatically. Please, do not edit."
  echo "#"
- echo "AC_DEFUN([tar_PAXUTILS],["
+ echo "AC_DEFUN([${package}_PAXUTILS],["
  cat ${PAXUTILS_SRCDIR}/m4/DISTFILES | sed '/^#/d;s/\(.*\)\.m4/pu_\1/' | tr a-z A-Z
  echo "])") > ./m4/paxutils.m4
 
@@ -336,7 +336,7 @@ sed '
 echo "$0: Creating m4/gnulib.m4"
 (echo "# This file is generated automatically. Please, do not edit."
  echo "#"
- echo "AC_DEFUN([tar_GNULIB],["
+ echo "AC_DEFUN([${package}_GNULIB],["
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"
     $gnulib_tool --extract-autoconf-snippet $gnulib_module
@@ -350,7 +350,7 @@ echo "$0: Creating lib/Makefile.am"
  for gnulib_module in $gnulib_modules; do
     echo "# $gnulib_module"
     $gnulib_tool --extract-automake-snippet $gnulib_module
- done | sed 's/lib_SOURCES/libtar_a_SOURCES/g' ) > lib/Makefile.am
+ done | sed "s/lib_SOURCES/lib${package}_a_SOURCES/g" ) > lib/Makefile.am
 
 # Get translations.
 if test "$DOWNLOAD_PO" = "yes"; then
@@ -369,8 +369,6 @@ intl_files_to_remove='
   m4/glibc2.m4
   m4/intdiv0.m4
   m4/intmax.m4
-  m4/inttypes-h.m4
-  m4/inttypes-pri.m4
   m4/lcmessage.m4
   m4/lock.m4
   m4/printf-posix.m4
@@ -381,6 +379,7 @@ rm -fr $intl_files_to_remove || exit
 
 
 # Undo changes to gnulib files that autoreconf made.
+
 for gnulib_file in $gnulib_files; do
   test ! -f $gnulib_file || cmp -s $gnulib_file $GNULIB_SRCDIR/$gnulib_file || {
     rm -f $gnulib_file &&