2007-01-08 Bruno Haible <bruno@clisp.org>

[gnulib.git] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index 6c7f50b..7b1d9ce 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002-2006 Free Software Foundation, Inc.
+# Copyright (C) 2002-2007 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
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-12-31 06:29:50 $'
+cvsdatestamp='$Date: 2007-01-08 19:20:07 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -185,7 +185,7 @@ Written by" "Bruno Haible" "and" "Simon Josefsson"
 # outputs to stdout a header for a generated file.
 func_emit_copyright_notice ()
 {
-  echo "# Copyright (C) 2004-2006 Free Software Foundation, Inc."
+  echo "# Copyright (C) 2004-2007 Free Software Foundation, Inc."
   echo "#"
   echo "# This file is free software, distributed under the terms of the GNU"
   echo "# General Public License.  As a special exception to the GNU General"
@@ -699,7 +699,7 @@ func_ln_if_changed ()
     if test -n "$prereqs"; then
       autoconf_minversion=`
         for version in $prereqs; do echo $version; done |
-        LC_ALL=C sort -nu | sed 1q
+        LC_ALL=C sort -nru | sed 1q
       `
     fi
   fi
@@ -908,6 +908,7 @@ func_get_filelist ()
 {
   func_lookup_file "modules/$1"
   sed -n -e "/^Files$sed_extract_prog" < "$lookedup_file"
+  echo m4/gnulib-common.m4
   case "$autoconf_minversion" in
     2.59)
       #echo m4/onceonly.m4
@@ -2507,6 +2508,10 @@ func_create_testdir ()
    echo "AC_PROG_INSTALL"
    echo "AC_PROG_MAKE_SET"
    echo
+   echo "# For autobuild."
+   echo "AC_CANONICAL_BUILD"
+   echo "AC_CANONICAL_HOST"
+   echo
    echo "m4_pattern_forbid([^gl_[A-Z]])dnl the gnulib macro namespace"
    echo "m4_pattern_allow([^gl_ES\$])dnl a valid locale name"
    echo "m4_pattern_allow([^gl_LIBOBJS\$])dnl a variable"