update from texinfo

[gnulib.git] / build-aux / bootstrap

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 6fa1553..2087bab 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -49,7 +49,7 @@ Options:
                           not to have been checked out.
  --skip-po                Do not download po files.
 
                           not to have been checked out.
  --skip-po                Do not download po files.
 

-If the file bootstrap.conf exists in the current working directory, its
+If the file $0.conf exists in the same directory as this script, its

 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.
 contents are read as shell variables to configure the bootstrap.
 
 Running without arguments will suffice in most cases.


@@ -96,6 +96,11 @@ package=`sed -n "$extract_package_name" configure.ac` || exit
 gnulib_name=lib$package
 
 build_aux=build-aux
 gnulib_name=lib$package
 
 build_aux=build-aux

+source_base=lib
+m4_base=m4
+doc_base=doc
+tests_base=tests
+

 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files="
        $build_aux/install-sh
 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files="
        $build_aux/install-sh


@@ -141,7 +146,13 @@ copy=false
 vc_ignore=auto
 
 # Override the default configuration, if necessary.
 vc_ignore=auto
 
 # Override the default configuration, if necessary.

-test -r bootstrap.conf && . ./bootstrap.conf
+# Make sure that bootstrap.conf is sourced from the current directory
+# if we were invoked as "sh bootstrap".
+case "$0" in
+  */*) test -r "$0.conf" && . "$0.conf" ;;
+  *) test -r "$0.conf" && . ./"$0.conf" ;;
+esac
+

 
 if test "$vc_ignore" = auto; then
   vc_ignore=
 
 if test "$vc_ignore" = auto; then
   vc_ignore=


@@ -160,7 +171,7 @@ do
     usage
     exit;;
   --gnulib-srcdir=*)
     usage
     exit;;
   --gnulib-srcdir=*)

-    GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;;
+    GNULIB_SRCDIR=`expr "X$option" : 'X--gnulib-srcdir=\(.*\)'`;;

   --skip-po)
     SKIP_PO=t;;
   --force)
   --skip-po)
     SKIP_PO=t;;
   --force)


@@ -213,27 +224,65 @@ fi
 
 echo "$0: Bootstrapping from checked-out $package sources..."
 
 
 echo "$0: Bootstrapping from checked-out $package sources..."
 

+# See if we can use gnulib's git-merge-changelog merge driver.
+if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
+  if git config merge.merge-changelog.driver >/dev/null ; then
+    :
+  elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
+    echo "initializing git-merge-changelog driver"
+    git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
+    git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
+  else
+    echo "consider installing git-merge-changelog from gnulib"
+  fi
+fi
+
+

 cleanup_gnulib() {
   status=$?
   rm -fr gnulib
   exit $status
 }
 
 cleanup_gnulib() {
   status=$?
   rm -fr gnulib
   exit $status
 }
 

+git_modules_config () {
+  GIT_CONFIG_LOCAL=.gitmodules git config "$@"
+}
+

 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
 -)
 # Get gnulib files.
 
 case ${GNULIB_SRCDIR--} in
 -)

-  if [ ! -d gnulib ]; then
+  if git_modules_config submodule.gnulib.url >/dev/null; then
+    echo "$0: getting gnulib files..."
+    git submodule init || exit $?
+    git submodule update || exit $?
+
+  elif [ ! -d gnulib ]; then

     echo "$0: getting gnulib files..."
 
     trap cleanup_gnulib 1 2 13 15
 
     echo "$0: getting gnulib files..."
 
     trap cleanup_gnulib 1 2 13 15
 

-    git clone --depth 2 git://git.sv.gnu.org/gnulib ||
+    git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow=
+    git clone $shallow git://git.sv.gnu.org/gnulib ||

       cleanup_gnulib
 
     trap - 1 2 13 15
   fi
   GNULIB_SRCDIR=gnulib
       cleanup_gnulib
 
     trap - 1 2 13 15
   fi
   GNULIB_SRCDIR=gnulib

+  ;;
+*)
+  # Redirect the gnulib submodule to the directory on the command line
+  # if possible.
+  if test -d "$GNULIB_SRCDIR"/.git && \
+       git_modules_config submodule.gnulib.url >/dev/null; then
+    git submodule init
+    GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd`
+    git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR
+    echo "$0: getting gnulib files..."
+    git submodule update || exit $?
+    GNULIB_SRCDIR=gnulib
+  fi
+  ;;

 esac
 
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 esac
 
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool


@@ -268,11 +317,12 @@ update_po_files() {
 
   langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
   test "$langs" = '*' && langs=x
 
   langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
   test "$langs" = '*' && langs=x

-  for po in `cd $ref_po_dir && echo *.po|sed 's/\.po//g'`; do
+  for po in $langs; do

     case $po in x) continue;; esac
     new_po="$ref_po_dir/$po.po"
     cksum_file="$ref_po_dir/$po.s1"
     if ! test -f "$cksum_file" ||
     case $po in x) continue;; esac
     new_po="$ref_po_dir/$po.po"
     cksum_file="$ref_po_dir/$po.s1"
     if ! test -f "$cksum_file" ||

+       ! test -f "$po_dir/$po.po" ||

        ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then
       echo "updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file"
        ! sha1sum -c --status "$cksum_file" < "$new_po" > /dev/null; then
       echo "updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" && sha1sum < "$new_po" > "$cksum_file"


@@ -377,9 +427,13 @@ cp_mark_as_generated()
 
     if test -z "$c1"; then
       cmp -s "$cp_src" "$cp_dst" || {
 
     if test -z "$c1"; then
       cmp -s "$cp_src" "$cp_dst" || {

+       # Copy the file first to get proper permissions if it
+       # doesn't already exist.  Then overwrite the copy.

        echo "$0: cp -f $cp_src $cp_dst" &&
        rm -f "$cp_dst" &&
        echo "$0: cp -f $cp_src $cp_dst" &&
        rm -f "$cp_dst" &&

-       sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst"
+       cp "$cp_src" "$cp_dst-t" &&
+       sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
+       mv -f "$cp_dst-t" "$cp_dst"

       }
     else
       # Copy the file first to get proper permissions if it
       }
     else
       # Copy the file first to get proper permissions if it


@@ -409,6 +463,8 @@ version_controlled_file() {
             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
   elif test -d .git; then
     git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
   elif test -d .git; then
     git rm -n "$dir/$file" > /dev/null 2>&1 && found=yes

+  elif test -d .svn; then
+    svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes

   else
     echo "$0: no version control for $dir/$file?" >&2
   fi
   else
     echo "$0: no version control for $dir/$file?" >&2
   fi


@@ -490,11 +546,11 @@ gnulib_tool_options="\
  --import\
  --no-changelog\
  --aux-dir $bt/$build_aux\
  --import\
  --no-changelog\
  --aux-dir $bt/$build_aux\

- --doc-base $bt/doc\
+ --doc-base $bt/$doc_base\

  --lib $gnulib_name\
  --lib $gnulib_name\

- --m4-base $bt/m4/\
- --source-base $bt/lib/\
- --tests-base $bt/tests\
+ --m4-base $bt/$m4_base/\
+ --source-base $bt/$source_base/\
+ --tests-base $bt/$tests_base\

  --local-dir $local_gl_dir\
  $gnulib_tool_option_extras\
 "
  --local-dir $local_gl_dir\
  $gnulib_tool_option_extras\
 "


@@ -517,28 +573,20 @@ if test $with_gettext = yes; then
   cp configure.ac $bt2 &&
   (cd $bt2 && autopoint && rm configure.ac) &&
   slurp $bt2 $bt || exit
   cp configure.ac $bt2 &&
   (cd $bt2 && autopoint && rm configure.ac) &&
   slurp $bt2 $bt || exit

-
-  rm -fr $bt $bt2 || exit
-fi
-
-# Coreutils is unusual in that it generates some of its test-related
-# Makefile.am files.  That must be done before invoking automake.
-mam_template=tests/Makefile.am.in
-if test -f $mam_template; then
-  PERL=perl
-  for tool in cut head join pr sort tac tail test tr uniq wc; do
-    m=tests/$tool/Makefile.am
-    t=${m}t
-    rm -f $m $t
-    sed -n '1,/^##test-files-begin/p' $mam_template > $t
-    echo "x = $tool" >> $t
-    srcdir=tests/$tool
-    $PERL -I$srcdir -w -- tests/mk-script $srcdir --list >> $t
-    sed -n '/^##test-files-end/,$p' $mam_template >> $t
-    chmod -w $t
-    mv $t $m
-  done

 fi
 fi

+rm -fr $bt $bt2 || exit
+
+# Remove any dangling symlink matching "*.m4" or "*.[ch]" in some
+# gnulib-populated directories.  Such .m4 files would cause aclocal to fail.
+# The following requires GNU find 4.2.3 or newer.  Considering the usual
+# portability constraints of this script, that may seem a very demanding
+# requirement, but it should be ok.  Ignore any failure, which is fine,
+# since this is only a convenience to help developers avoid the relatively
+# unusual case in which a symlinked-to .m4 file is git-removed from gnulib
+# between successive runs of this script.
+find "$m4_base" "$source_base" \
+  -depth \( -name '*.m4' -o -name '*.[ch]' \) \
+  -type l -xtype l -delete > /dev/null 2>&1

 
 # Reconfigure, getting other files.
 
 
 # Reconfigure, getting other files.
 


@@ -550,8 +598,16 @@ for command in \
   'automake --add-missing --copy --force-missing';
 do
   if test "$command" = libtool; then
   'automake --add-missing --copy --force-missing';
 do
   if test "$command" = libtool; then

-    grep '^[    ]*AM_PROG_LIBTOOL\>' configure.ac >/dev/null ||
-      continue
+    use_libtool=0
+    # We'd like to use grep -E, to see if any of LT_INIT,
+    # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+    # but that's not portable enough (e.g., for Solaris).
+    grep '^[    ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+      && use_libtool=1
+    grep '^[    ]*LT_INIT' configure.ac >/dev/null \
+      && use_libtool=1
+    test $use_libtool = 0 \
+      && continue

     command='libtoolize -c -f'
   fi
   echo "$0: $command ..."
     command='libtoolize -c -f'
   fi
   echo "$0: $command ..."