Make it work also with Solaris /bin/sh.

diff --git a/ChangeLog b/ChangeLog
index 92409a6e801e94891b472bdea2e1c517fa12ca99..bf945c0f1ae9361fa06572b8695951a1d837ddbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-21  Mark D. Baushke  <mdb@gnu.org>
+            Bruno Haible <bruno@clisp.org>
+
+       * gnulib-tool (func_verify_module): Work around Sun's non-POSIX 1003.2
+       /bin/sh understanding of '!' conditional negation.
+
 2006-08-21  Jim Meyering  <jim@meyering.net>
 
        * modules/openat (Depends-on): Really alphabetize.

diff --git a/gnulib-tool b/gnulib-tool
index 90deaa0429e060c79b8b729a010043f6d29da87e..690886c0189128ae08500708212e53e2455bf813 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-08-15 11:52:39 $'
+cvsdatestamp='$Date: 2006-08-21 13:30:55 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -629,15 +629,18 @@ func_all_modules ()
 # verifies a module name
 func_verify_module ()
 {
-  if ! { test -f "$gnulib_dir/modules/$module" \
-         || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \
-              && test -f "$local_gnulib_dir/modules/$module"; }; } \
-     || test "CVS" = "$module" \
-     || test "ChangeLog" = "$module" \
-     || test "COPYING" = "$module" \
-     || test "README" = "$module" \
-     || test "TEMPLATE" = "$module" \
-     || test "TEMPLATE-TESTS" = "$module"; then
+  if { test -f "$gnulib_dir/modules/$module" \
+       || { test -n "$local_gnulib_dir" && test -d "$local_gnulib_dir/modules" \
+            && test -f "$local_gnulib_dir/modules/$module"; }; } \
+     && test "CVS" != "$module" \
+     && test "ChangeLog" != "$module" \
+     && test "COPYING" != "$module" \
+     && test "README" != "$module" \
+     && test "TEMPLATE" != "$module" \
+     && test "TEMPLATE-TESTS" != "$module"; then
+    # OK, $module is a correct module name.
+    :
+  else
     echo "gnulib-tool: module $module doesn't exist" 1>&2
     module=
   fi