Rework advice for preventing empty .o files.

[gnulib.git] / gnulib-tool

diff --git a/gnulib-tool b/gnulib-tool
index 070b779..3a87d2f 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2003-05-22 13:57:59 $'
+cvsdatestamp='$Date: 2003-09-17 18:30:23 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -197,7 +197,7 @@ case "$0" in
      fi
      ;;
 esac
-while test -L "$self_abspathname"; do
+while test -h "$self_abspathname"; do
   # Resolve symbolic link.
   sedexpr1='s, -> ,#%%#,'
   sedexpr2='s,^.*#%%#\(.*\)$,\1,p'
@@ -231,11 +231,16 @@ func_verify_module ()
   fi
 }
 
-tags_regexp='\(Description\|Files\|Depends-on\|configure\.ac\|Makefile\.am\|Include\|Maintainer\)'
 sed_extract_prog=':[   ]*$/ {
   :a
     n
-    s/^'"$tags_regexp"':[      ]*$//
+    s/^Description:[   ]*$//
+    s/^Files:[         ]*$//
+    s/^Depends-on:[    ]*$//
+    s/^configure\.ac:[         ]*$//
+    s/^Makefile\.am:[  ]*$//
+    s/^Include:[       ]*$//
+    s/^Maintainer:[    ]*$//
     tb
     p
     ba
@@ -300,6 +305,11 @@ func_create_testdir ()
     for module in $modules; do
       func_verify_module
       if test -n "$module"; then
+        # Duplicate dependenies are harmless, but Jim wants a warning.
+        duplicated_deps=`func_get_dependencies $module | sort | uniq -d`
+        if test -n "$duplicated_deps"; then
+          echo "warning: module $module has duplicated dependencies: "`echo $duplicated_deps` 1>&2
+        fi
         xmodules="$xmodules $module "`func_get_dependencies $module`
       fi
     done
@@ -421,6 +431,10 @@ func_create_testdir ()
      echo "AC_GNU_SOURCE"
      echo
    fi
+   if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then
+     echo "gl_USE_SYSTEM_EXTENSIONS"
+     echo
+   fi
    for module in $modules; do
      func_verify_module
      if test -n "$module"; then