X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gnulib-tool;h=4fb7d5e62ac8012de3e0a1014c4474631973fca4;hb=4c399534696c5acbe5ecb57c40f2b5841cb8320d;hp=b334e18d13117161b377d4ab12869b35c0f46205;hpb=b857fd90570b0775d9f577c67632e4b2d3581bb1;p=gnulib.git

diff --git a/gnulib-tool b/gnulib-tool
index b334e18d1..4fb7d5e62 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-09-22 12:47:54 $'
+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='
@@ -1086,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
@@ -1093,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
   (
@@ -1200,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
@@ -1691,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
@@ -1704,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.
@@ -1847,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"
@@ -2099,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
@@ -2113,7 +2115,7 @@ func_create_testdir ()
         fi
       fi
     done
-    exec 1<&5 5<&-
+    exec 0<&5 5<&-
   }
 
   # Create $sourcebase/Makefile.am.
@@ -2382,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"