* m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Renamed from

[gnulib.git] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index f615957..4fb7d5e 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-09-19 14:07:28 $'
+cvsdatestamp='$Date: 2006-10-07 14:54:51 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -157,11 +157,12 @@ Report bugs to <bug-gnulib@gnu.org>."
 func_version ()
 {
   year=`echo "$last_checkin_date" | sed -e 's,/.*$,,'`
-  echo "$progname (GNU $package) $version"
-  echo "Copyright (C) $year Free Software Foundation, Inc.
+  echo "\
+$progname (GNU $package) $version
+Copyright (C) $year Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-  echo "Written by" "Bruno Haible" "and" "Simon Josefsson"
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+Written by" "Bruno Haible" "and" "Simon Josefsson"
 }
 
 # func_emit_copyright_notice
@@ -1085,6 +1086,7 @@ func_emit_lib_Makefile_am ()
     perhapsLT=
     sed_eliminate_LDFLAGS='/^lib_LDFLAGS[       ]*+=/d'
   fi
+  echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
   echo "## Process this file with automake to produce Makefile.in."
   func_emit_copyright_notice
   if test -n "$actioncmd"; then
@@ -1092,8 +1094,7 @@ func_emit_lib_Makefile_am ()
   fi
   echo
   if test -z "$makefile_name"; then
-    # No need to generate dependencies since the sources are in gnulib, not here.
-    echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies"
+    echo "AUTOMAKE_OPTIONS = 1.5 gnits"
   fi
   echo
   (
@@ -1199,6 +1200,7 @@ func_emit_tests_Makefile_am ()
     sed_eliminate_LDFLAGS='/^lib_LDFLAGS[       ]*+=/d'
   fi
   testsbase_inverse=`echo "$testsbase" | sed -e 's,/$,,' | sed -e 's,[^/][^/]*,..,g'`
+  echo "## DO NOT EDIT! GENERATED AUTOMATICALLY!"
   echo "## Process this file with automake to produce Makefile.in."
   func_emit_copyright_notice
   echo
@@ -1690,11 +1692,11 @@ func_import ()
     | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/added-files
   { # Rearrange file descriptors. Needed because "while ... done < ..."
     # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
-    exec 5<&1 < "$tmp"/added-files
+    exec 5<&0 < "$tmp"/added-files
     while read g f; do
       func_add_or_update
     done
-    exec 1<&5 5<&-
+    exec 0<&5 5<&-
   }
   # Then the files that are in new-files and in old-files:
   already_present=true
@@ -1703,11 +1705,11 @@ func_import ()
     | sed -e "s,^.*\$,&$delimiter&," -e "$sed_rewrite_new_files" > "$tmp"/kept-files
   { # Rearrange file descriptors. Needed because "while ... done < ..."
     # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
-    exec 5<&1 < "$tmp"/kept-files
+    exec 5<&0 < "$tmp"/kept-files
     while read g f; do
       func_add_or_update
     done
-    exec 1<&5 5<&-
+    exec 0<&5 5<&-
   }
 
   # Command-line invocation printed in a comment in generated gnulib-cache.m4.
@@ -1846,6 +1848,7 @@ func_import ()
   # Create m4/gnulib-comp.m4.
   func_dest_tmpfilename $m4base/gnulib-comp.m4
   (
+    echo "# DO NOT EDIT! GENERATED AUTOMATICALLY!"
     func_emit_copyright_notice
     echo "#"
     echo "# This file represents the compiled summary of the specification in"
@@ -1886,6 +1889,7 @@ func_import ()
       echo "  gl_libdeps="
       echo "  gl_ltlibdeps="
     fi
+    echo "  gl_source_base='$sourcebase'"
     if test "$auxdir" != "build-aux"; then
       sed_replace_build_aux='
         :a
@@ -2097,7 +2101,7 @@ func_create_testdir ()
     > "$tmp"/files
   { # Rearrange file descriptors. Needed because "while ... done < ..."
     # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.
-    exec 5<&1 < "$tmp"/files
+    exec 5<&0 < "$tmp"/files
     while read g f; do
       func_lookup_file "$f"
       if test -n "$lookedup_tmp"; then
@@ -2111,7 +2115,7 @@ func_create_testdir ()
         fi
       fi
     done
-    exec 1<&5 5<&-
+    exec 0<&5 5<&-
   }
 
   # Create $sourcebase/Makefile.am.
@@ -2181,6 +2185,7 @@ func_create_testdir ()
        echo "gl_libdeps="
        echo "gl_ltlibdeps="
      fi
+     echo "gl_source_base='$testsbase'"
      # Wrap the set of autoconf snippets into an autoconf macro that is then
      # invoked. This is needed because autoconf does not support AC_REQUIRE
      # at the top level:
@@ -2289,6 +2294,7 @@ func_create_testdir ()
      echo "gl_libdeps="
      echo "gl_ltlibdeps="
    fi
+   echo "gl_source_base='$sourcebase'"
    # Wrap the set of autoconf snippets into an autoconf macro that is then
    # invoked. This is needed because autoconf does not support AC_REQUIRE
    # at the top level:
@@ -2378,8 +2384,9 @@ func_create_megatestdir ()
     func_append megasubdirs "$onemodule "
   done
   # Then, all modules all together.
+  # Except config-h, which breaks all modules which use HAVE_CONFIG_H.
   # Except fnmatch-posix, which conflicts with fnmatch-gnu. FIXME.
-  allmodules=`for m in $allmodules; do if test $m != fnmatch-posix; then echo $m; fi; done`
+  allmodules=`for m in $allmodules; do if test $m != config-h && test $m != fnmatch-posix; then echo $m; fi; done`
   func_create_testdir "$megatestdir/ALL" "$allmodules"
   func_append megasubdirs "ALL"