More autoconf 2.5x/automake 1.5 changes

6 files changed, 93 insertions, 70 deletions

diff --git a/Makefile.am b/Makefile.am
index ac23373a..8675fe28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,31 @@ ACINCLUDE_INPUTS = $(M4DIR)/decl.m4 $(M4DIR)/djgpp.m4 $(M4DIR)/dosfile.m4 \
   $(M4DIR)/uintmax_t.m4 $(M4DIR)/ulonglong.m4 $(M4DIR)/xstrtoumax.m4
 $(srcdir)/acinclude.m4 : $(ACINCLUDE_INPUTS)
 	cat $(ACINCLUDE_INPUTS) >$(srcdir)/acinclude.m4
+
+cvs-clean:
+	@if test ! -d CVS; then \
+	  echo "You don't have a toplevel CVS directory."; \
+	  echo "You most certainly didn't use cvs to get these sources."; \
+	  echo "But this function depends on cvs's information."; \
+	  exit 1 ;\
+	fi;\
+	pwd=`pwd` ;\
+	dirs=`find . -type d | grep -v CVS | sed -e "s#^./##"` ;\
+	for i in $$dirs; do \
+	  if test ! -d "$$pwd/$$i/CVS"; then \
+	    echo "D $$i" ;\
+	    rm -rf "$$pwd/$$i"; \
+	    continue; \
+	  fi ;\
+	  cd $$pwd/$$i ;\
+	  for f in * .*; do \
+	    if test ! -d "$$f"; then \
+	      if grep "^/$$f/" CVS/Entries > /dev/null; then \
+		a="b"; \
+	      else \
+	        echo "F $$i/$$f"; \
+		rm -f "$$pwd/$$i/$$f"; \
+	      fi; \
+	    fi ; \
+	  done; \
+	done
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6d8cf647..b5680dc1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,6 @@ libgreputils_a_SOURCES = \
   isdir.c obstack.c quotearg.c savedir.c xmalloc.c xstrtol.c  xstrtoumax.c
 
 libgreputils_a_LIBADD = @LIBOBJS@ @ALLOCA@
-libgreputils_a_DEPENDENCIES = $(libgreputils_a_LIBADD)
 noinst_HEADERS = \
   closeout.h error.h exclude.h fnmatch.h getopt.h \
   hard-locale.h obstack.h quotearg.h regex.h savedir.h xalloc.h xstrtol.h
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 5c63480e..d2373ea3 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -8,7 +8,7 @@
 
 # serial 105
 
-AC_DEFUN(AM_WITH_NLS,
+AC_DEFUN([AM_WITH_NLS],
   [AC_MSG_CHECKING([whether NLS is requested])
     dnl Default is enabled NLS
     AC_ARG_ENABLE(nls,
@@ -61,8 +61,8 @@ AC_DEFUN(AM_WITH_NLS,
 
 	   if test "$gt_cv_func_gettext_libc" = "yes" \
 	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT, 1, [Define if you have gettext])
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+	      AC_DEFINE([HAVE_GETTEXT], 1, [Define if you have gettext])
+	      AM_PATH_PROG_WITH_TEST([MSGFMT], [msgfmt],
 		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
 	      if test "$MSGFMT" != "no"; then
 		AC_CHECK_FUNCS(dcgettext)
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 604e553f..f33cf6a9 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -11,7 +11,7 @@
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
 [# Extract the first word of "$2", so it can be a program name with args.
 set dummy $2; ac_word=[$]2
 AC_MSG_CHECKING([for $ac_word])
@@ -23,6 +23,7 @@ changequote([, ])dnl
   ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
   ;;
   *)
+  if test -z "$ac_x"; then ac_x="-x"; fi
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
   for ac_dir in ifelse([$5], , $PATH, [$5]); do
     test -z "$ac_dir" && ac_dir=.
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 12b8da30..30f1d8dc 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -69,6 +69,8 @@ Output control:\n\
   -I                        equivalent to --binary-files=without-match\n\
   -d, --directories=ACTION  how to handle directories\n\
                             ACTION is 'read', 'recurse', or 'skip'\n\
+  -D, --devices=ACTION      how to handle devices, FIFOs and sockets\n\
+                            ACTION is 'read' or 'skip'\n\
   -R, -r, --recursive       equivalent to --directories=recurse\n\
       --include=PATTERN     files that match PATTERN will be examined\n\
       --exclude=PATTERN     files that match PATTERN will be skipped.\n\
@@ -85,42 +87,36 @@ Context control:\n\
   -A, --after-context=NUM   print NUM lines of trailing context\n\
   -C, --context=NUM         print NUM lines of output context\n\
   -NUM                      same as --context=NUM\n\
-      --color, --colour     use markers to distinguish the matching string\n\
-  -U, --binary              do not strip CR characters at EOL (MSDOS)\n\
-  -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n\
-\n\
-`egrep' means `grep -E'.  `fgrep' means `grep -F'.\n\
-With no FILE, or when FILE is -, read standard input.  If less than\n\
-two FILEs given, assume -h.  Exit status is 0 if match, 1 if no match,\n\
-and 2 if trouble.\n", 27},
+      --color[=WHEN],", 27},
   {"\
 \n\
 Report bugs to <bug-gnu-utils@gnu.org>.\n", 28},
   {"conflicting matchers specified", 29},
-  {"unknown directories method", 30},
-  {"invalid max count", 31},
-  {"unknown binary-files type", 32},
-  {"%s (GNU grep) %s\n", 33},
-  {"Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n", 34},
+  {"unknown devices method", 30},
+  {"unknown directories method", 31},
+  {"invalid max count", 32},
+  {"unknown binary-files type", 33},
+  {"%s (GNU grep) %s\n", 34},
+  {"Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n", 35},
   {"\
 This is free software; see the source for copying conditions. There is NO\n\
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 35},
-  {"The -P option is not supported", 36},
-  {"The -P and -z options cannot be combined", 37},
-  {"Unknown system error", 38},
-  {"%s: option `%s' is ambiguous\n", 39},
-  {"%s: option `--%s' doesn't allow an argument\n", 40},
-  {"%s: option `%c%s' doesn't allow an argument\n", 41},
-  {"%s: option `%s' requires an argument\n", 42},
-  {"%s: unrecognized option `--%s'\n", 43},
-  {"%s: unrecognized option `%c%s'\n", 44},
-  {"%s: illegal option -- %c\n", 45},
-  {"%s: invalid option -- %c\n", 46},
-  {"%s: option requires an argument -- %c\n", 47},
-  {"%s: option `-W %s' is ambiguous\n", 48},
-  {"%s: option `-W %s' doesn't allow an argument\n", 49},
-  {"`", 50},
-  {"'", 51},
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n", 36},
+  {"The -P option is not supported", 37},
+  {"The -P and -z options cannot be combined", 38},
+  {"Unknown system error", 39},
+  {"%s: option `%s' is ambiguous\n", 40},
+  {"%s: option `--%s' doesn't allow an argument\n", 41},
+  {"%s: option `%c%s' doesn't allow an argument\n", 42},
+  {"%s: option `%s' requires an argument\n", 43},
+  {"%s: unrecognized option `--%s'\n", 44},
+  {"%s: unrecognized option `%c%s'\n", 45},
+  {"%s: illegal option -- %c\n", 46},
+  {"%s: invalid option -- %c\n", 47},
+  {"%s: option requires an argument -- %c\n", 48},
+  {"%s: option `-W %s' is ambiguous\n", 49},
+  {"%s: option `-W %s' doesn't allow an argument\n", 50},
+  {"`", 51},
+  {"'", 52},
 };
 
-int _msg_tbl_length = 51;
+int _msg_tbl_length = 52;
diff --git a/po/grep.pot b/po/grep.pot
index f78315c5..7f9e8a69 100644
--- a/po/grep.pot
+++ b/po/grep.pot
@@ -6,13 +6,13 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-07-31 16:17-0400\n"
+"POT-Creation-Date: 2001-09-25 14:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: src/dfa.c:136 src/dfa.c:147 src/dfa.c:158 src/search.c:689
 msgid "Memory exhausted"
@@ -62,52 +62,52 @@ msgstr ""
 msgid "memory exhausted"
 msgstr ""
 
-#: src/grep.c:191
+#: src/grep.c:199
 msgid "invalid context length argument"
 msgstr ""
 
-#: src/grep.c:458
+#: src/grep.c:468
 msgid "input is too large to count"
 msgstr ""
 
-#: src/grep.c:531
+#: src/grep.c:541
 msgid "writing output"
 msgstr ""
 
-#: src/grep.c:804
+#: src/grep.c:814
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr ""
 
-#: src/grep.c:818
+#: src/grep.c:828
 msgid "(standard input)"
 msgstr ""
 
-#: src/grep.c:923
+#: src/grep.c:933
 #, c-format
 msgid "warning: %s: %s\n"
 msgstr ""
 
-#: src/grep.c:924
+#: src/grep.c:934
 msgid "recursive directory loop"
 msgstr ""
 
-#: src/grep.c:972
+#: src/grep.c:982
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr ""
 
-#: src/grep.c:974
+#: src/grep.c:984
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: src/grep.c:979
+#: src/grep.c:989
 #, c-format
 msgid "Usage: %s [OPTION]... PATTERN [FILE] ...\n"
 msgstr ""
 
-#: src/grep.c:980
+#: src/grep.c:990
 #, c-format
 msgid ""
 "Search for PATTERN in each FILE or standard input.\n"
@@ -116,7 +116,7 @@ msgid ""
 "Regexp selection and interpretation:\n"
 msgstr ""
 
-#: src/grep.c:985
+#: src/grep.c:995
 msgid ""
 "  -E, --extended-regexp     PATTERN is an extended regular expression\n"
 "  -F, --fixed-strings       PATTERN is a set of newline-separated strings\n"
@@ -124,7 +124,7 @@ msgid ""
 "  -P, --perl-regexp         PATTERN is a Perl regular expression\n"
 msgstr ""
 
-#: src/grep.c:990
+#: src/grep.c:1000
 msgid ""
 "  -e, --regexp=PATTERN      use PATTERN as a regular expression\n"
 "  -f, --file=FILE           obtain PATTERN from FILE\n"
@@ -134,7 +134,7 @@ msgid ""
 "  -z, --null-data           a data line ends in 0 byte, not newline\n"
 msgstr ""
 
-#: src/grep.c:997
+#: src/grep.c:1007
 msgid ""
 "\n"
 "Miscellaneous:\n"
@@ -145,7 +145,7 @@ msgid ""
 "      --mmap                use memory-mapped input if possible\n"
 msgstr ""
 
-#: src/grep.c:1005
+#: src/grep.c:1015
 msgid ""
 "\n"
 "Output control:\n"
@@ -162,6 +162,8 @@ msgid ""
 "  -I                        equivalent to --binary-files=without-match\n"
 "  -d, --directories=ACTION  how to handle directories\n"
 "                            ACTION is 'read', 'recurse', or 'skip'\n"
+"  -D, --devices=ACTION      how to handle devices, FIFOs and sockets\n"
+"                            ACTION is 'read' or 'skip'\n"
 "  -R, -r, --recursive       equivalent to --directories=recurse\n"
 "      --include=PATTERN     files that match PATTERN will be examined\n"
 "      --exclude=PATTERN     files that match PATTERN will be skipped.\n"
@@ -173,7 +175,7 @@ msgid ""
 "  -Z, --null                print 0 byte after FILE name\n"
 msgstr ""
 
-#: src/grep.c:1029
+#: src/grep.c:1041
 msgid ""
 "\n"
 "Context control:\n"
@@ -181,48 +183,45 @@ msgid ""
 "  -A, --after-context=NUM   print NUM lines of trailing context\n"
 "  -C, --context=NUM         print NUM lines of output context\n"
 "  -NUM                      same as --context=NUM\n"
-"      --color, --colour     use markers to distinguish the matching string\n"
-"  -U, --binary              do not strip CR characters at EOL (MSDOS)\n"
-"  -u, --unix-byte-offsets   report offsets as if CRs were not there (MSDOS)\n"
-"\n"
-"`egrep' means `grep -E'.  `fgrep' means `grep -F'.\n"
-"With no FILE, or when FILE is -, read standard input.  If less than\n"
-"two FILEs given, assume -h.  Exit status is 0 if match, 1 if no match,\n"
-"and 2 if trouble.\n"
+"      --color[=WHEN],"
 msgstr ""
 
-#: src/grep.c:1044
+#: src/grep.c:1058
 msgid ""
 "\n"
 "Report bugs to <bug-gnu-utils@gnu.org>.\n"
 msgstr ""
 
-#: src/grep.c:1054
+#: src/grep.c:1068
 msgid "conflicting matchers specified"
 msgstr ""
 
-#: src/grep.c:1347
+#: src/grep.c:1303
+msgid "unknown devices method"
+msgstr ""
+
+#: src/grep.c:1370
 msgid "unknown directories method"
 msgstr ""
 
-#: src/grep.c:1414
+#: src/grep.c:1437
 msgid "invalid max count"
 msgstr ""
 
-#: src/grep.c:1464
+#: src/grep.c:1487
 msgid "unknown binary-files type"
 msgstr ""
 
-#: src/grep.c:1535
+#: src/grep.c:1578
 #, c-format
 msgid "%s (GNU grep) %s\n"
 msgstr ""
 
-#: src/grep.c:1537
+#: src/grep.c:1580
 msgid "Copyright 1988, 1992-1999, 2000, 2001 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: src/grep.c:1539
+#: src/grep.c:1582
 msgid ""
 "This is free software; see the source for copying conditions. There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"