Avoid assigning ARPA_INET_H in different .m4 files.

[gnulib.git] / build-aux / bootstrap

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index e574039..74fa3eb 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap this package from checked-out sources.
 
 
 # Bootstrap this package from checked-out sources.
 

-# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2003-2008 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
 
 # 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


@@ -48,8 +48,6 @@ Options:
  --force                  Attempt to bootstrap even if the sources seem
                           not to have been checked out.
  --skip-po                Do not download po files.
  --force                  Attempt to bootstrap even if the sources seem
                           not to have been checked out.
  --skip-po                Do not download po files.

- --cvs-user=USERNAME      Set the username to use when checking out
-                          sources from the gnulib repository.

 
 If the file bootstrap.conf exists in the current working directory, its
 contents are read as shell variables to configure the bootstrap.
 
 If the file bootstrap.conf exists in the current working directory, its
 contents are read as shell variables to configure the bootstrap.


@@ -79,9 +77,10 @@ po_download_command_format=\
 
 extract_package_name='
   /^AC_INIT(/{
 
 extract_package_name='
   /^AC_INIT(/{

-     /.*,.*,.*,/{
+     /.*,.*,.*, */{

        s///
        s/[][]//g
        s///
        s/[][]//g

+       s/)$//

        p
        q
      }
        p
        q
      }


@@ -97,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


@@ -122,6 +126,9 @@ XGETTEXT_OPTIONS='\\\
  --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
 '
 
  --flag=error:3:c-format --flag=error_at_line:5:c-format\\\
 '
 

+# Package bug report address for gettext files
+MSGID_BUGS_ADDRESS=bug-$package@gnu.org
+

 # Files we don't want to import.
 excluded_files=
 
 # Files we don't want to import.
 excluded_files=
 


@@ -158,9 +165,7 @@ do
     usage
     exit;;
   --gnulib-srcdir=*)
     usage
     exit;;
   --gnulib-srcdir=*)

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

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


@@ -226,23 +231,9 @@ case ${GNULIB_SRCDIR--} in
   if [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 
   if [ ! -d gnulib ]; then
     echo "$0: getting gnulib files..."
 

-    case ${CVS_AUTH-pserver} in
-    pserver)
-      CVS_PREFIX=':pserver:anonymous@';;
-    ssh)
-      CVS_PREFIX="$CVS_USER${CVS_USER+@}";;
-    *)
-      echo "$0: $CVS_AUTH: Unknown CVS access method" >&2
-      exit 1;;
-    esac
-
-    case $CVS_RSH in
-    '') CVS_RSH=ssh; export CVS_RSH;;
-    esac
-

     trap cleanup_gnulib 1 2 13 15
 
     trap cleanup_gnulib 1 2 13 15
 

-    cvs -z3 -q -d ${CVS_PREFIX}cvs.savannah.gnu.org:/cvsroot/gnulib co gnulib ||
+    git clone --depth 2 git://git.sv.gnu.org/gnulib ||

       cleanup_gnulib
 
     trap - 1 2 13 15
       cleanup_gnulib
 
     trap - 1 2 13 15


@@ -280,13 +271,18 @@ update_po_files() {
     && ls "$ref_po_dir"/*.po 2>/dev/null |
       sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
 
     && ls "$ref_po_dir"/*.po 2>/dev/null |
       sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
 

-  for po in `cd $ref_po_dir && echo *.po|sed 's/\.po//g'`; do
-     new_po="$ref_po_dir/$po.po"
-     cksum_file="$ref_po_dir/$po.s1"
-     if ! 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"
-     fi
+  langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
+  test "$langs" = '*' && langs=x
+  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" ||
+       ! 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"
+    fi

   done
 }
 
   done
 }
 


@@ -380,11 +376,20 @@ cp_mark_as_generated()
       *)                  c1=     ; c2=     ;;
     esac
 
       *)                  c1=     ; c2=     ;;
     esac
 

+    # If the destination directory doesn't exist, create it.
+    # This is required at least for "lib/uniwidth/cjk.h".
+    dst_dir=`dirname "$cp_dst"`
+    test -d "$dst_dir" || mkdir -p "$dst_dir"
+

     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


@@ -413,7 +418,9 @@ version_controlled_file() {
     grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
   elif test -d .git; then
     grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |
             grep '^/[^/]*/[0-9]' > /dev/null && found=yes
   elif test -d .git; then

-    git-rm -n "$dir/$file" > /dev/null 2>&1 && found=yes
+    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


@@ -468,16 +475,16 @@ slurp() {
       ig=$dir/$dot_ig
       if test -n "$copied"; then
        insert_sorted_if_absent $ig "$copied"
       ig=$dir/$dot_ig
       if test -n "$copied"; then
        insert_sorted_if_absent $ig "$copied"

-       # If an ignored file name ends with _.h, then also add
+       # If an ignored file name ends with .in.h, then also add

        # the name with just ".h".  Many gnulib headers are generated,
        # the name with just ".h".  Many gnulib headers are generated,

-       # e.g., stdint_.h -> stdint.h, dirent_.h ->..., etc.
+       # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.

        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
        # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed

-       f=`echo "$copied"|sed 's/_\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
+       f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`

        insert_sorted_if_absent $ig "$f"
 
        insert_sorted_if_absent $ig "$f"
 

-       # For files like sys_stat_.h and sys_time_.h, record as
+       # For files like sys_stat.in.h and sys_time.in.h, record as

        # ignorable the directory we might eventually create: sys/.
        # ignorable the directory we might eventually create: sys/.

-       f=`echo "$copied"|sed 's/sys_.*_\.h$/sys/'`
+       f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`

        insert_sorted_if_absent $ig "$f"
       fi
     done
        insert_sorted_if_absent $ig "$f"
       fi
     done


@@ -495,13 +502,13 @@ 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\
  --local-dir $local_gl_dir\

-$gnulib_tool_option_extras\
+ $gnulib_tool_option_extras\

 "
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
 "
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&


@@ -522,28 +529,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.
 


@@ -580,7 +579,7 @@ if test $with_gettext = yes; then
   rm -f po/Makevars
   sed '
     /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/
   rm -f po/Makevars
   sed '
     /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/

-    /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/
+    /^MSGID_BUGS_ADDRESS *=/s/=.*/= '"$MSGID_BUGS_ADDRESS"'/

     /^XGETTEXT_OPTIONS *=/{
       s/$/ \\/
       a\
     /^XGETTEXT_OPTIONS *=/{
       s/$/ \\/
       a\