Index: ChangeLog
===================================================================
RCS file: /cvsroot/grep/grep/ChangeLog,v
retrieving revision 1.196
diff -u -r1.196 ChangeLog
--- ChangeLog	19 Nov 2004 14:00:17 -0000	1.196
+++ ChangeLog	19 Nov 2004 18:36:28 -0000
@@ -1,3 +1,9 @@
+2004-11-19  Tony Abou-Assaleh <address@hidden>
+
+	* Eliminate underquoted definition warnings from m4/*.m4 files.
+	* Use patsubst instead of m4_patsubst in m4/header.m4.
+	* Use regexp instead of m4_regexp in m4/header.m4.
+
 2004-11-11  Stepan Kasal  <address@hidden>
 
 	* tests/spencer1.awk: Use only lines with 3 fields.
Index: m4/decl.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/decl.m4,v
retrieving revision 1.2
diff -u -r1.2 decl.m4
--- m4/decl.m4	25 Sep 2001 12:16:48 -0000	1.2
+++ m4/decl.m4	19 Nov 2004 18:36:28 -0000
@@ -1,6 +1,6 @@
 #serial 5
 
-AC_DEFUN(jm_CHECK_DECLARATION,
+AC_DEFUN([jm_CHECK_DECLARATION],
 [
   AC_MSG_CHECKING([whether $1 is declared])
   AC_CACHE_VAL(jm_cv_func_decl_$1,
@@ -25,7 +25,7 @@
 
 dnl jm_CHECK_DECLARATIONS(INCLUDES, FUNCTION... [, ACTION-IF-DECLARED
 dnl                       [, ACTION-IF-NOT-DECLARED]])
-AC_DEFUN(jm_CHECK_DECLARATIONS,
+AC_DEFUN([jm_CHECK_DECLARATIONS],
 [
   for jm_func in $2
   do
Index: m4/djgpp.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/djgpp.m4,v
retrieving revision 1.2
diff -u -r1.2 djgpp.m4
--- m4/djgpp.m4	10 Feb 1999 05:35:03 -0000	1.2
+++ m4/djgpp.m4	19 Nov 2004 18:36:28 -0000
@@ -1,6 +1,6 @@
 dnl Check for DJGPP. we use DJ_GPP as the variable
 dnl EXEEXXT
-AC_DEFUN(AC_DJGPP,
+AC_DEFUN([AC_DJGPP],
 [AC_CACHE_CHECK(for DJGPP environment, ac_cv_djgpp,
 [AC_TRY_COMPILE(,[ return __DJGPP__;],
 ac_cv_djgpp=yes, ac_cv_djgpp=no)
Index: m4/dosfile.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/dosfile.m4,v
retrieving revision 1.5
diff -u -r1.5 dosfile.m4
--- m4/dosfile.m4	25 Sep 2001 12:16:48 -0000	1.5
+++ m4/dosfile.m4	19 Nov 2004 18:36:28 -0000
@@ -3,7 +3,7 @@
 # Also set the macro HAVE_DOS_FILE_CONTENTS for now,
 # since don't know of a good way to independently check this.
 dnl AC_DOSFILE()
-AC_DEFUN(AC_DOSFILE,
+AC_DEFUN([AC_DOSFILE],
 [
   AC_CACHE_CHECK([for dos file convention], ac_cv_dosfile,
     [if test -d ".\."; then
Index: m4/envsep.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/envsep.m4,v
retrieving revision 1.5
diff -u -r1.5 envsep.m4
--- m4/envsep.m4	10 Feb 1999 05:35:03 -0000	1.5
+++ m4/envsep.m4	19 Nov 2004 18:36:28 -0000
@@ -3,7 +3,7 @@
 
 dnl AM_SEP()
 dnl SEP
-AC_DEFUN(AM_SEP,
+AC_DEFUN([AM_SEP],
 [AC_REQUIRE([AC_CYGWIN])
 AC_REQUIRE([AC_MINGW32])
 AC_REQUIRE([AC_DJGPP])
Index: m4/error.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/error.m4,v
retrieving revision 1.1
diff -u -r1.1 error.m4
--- m4/error.m4	4 Mar 2001 05:29:16 -0000	1.1
+++ m4/error.m4	19 Nov 2004 18:36:28 -0000
@@ -4,7 +4,7 @@
 dnl directory -- otherwise, they'll conflict with existing files.
 
 dnl These are the prerequisite macros for GNU's error.c file.
-AC_DEFUN(jm_PREREQ_ERROR,
+AC_DEFUN([jm_PREREQ_ERROR],
 [
   AC_CHECK_FUNCS(strerror strerror_r vprintf doprnt)
   AC_HEADER_STDC
Index: m4/glibc.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/glibc.m4,v
retrieving revision 1.1
diff -u -r1.1 glibc.m4
--- m4/glibc.m4	2 Feb 1999 05:59:29 -0000	1.1
+++ m4/glibc.m4	19 Nov 2004 18:36:28 -0000
@@ -2,7 +2,7 @@
 dnl Test for the GNU C Library.
 dnl FIXME: this should migrate into libit.
 
-AC_DEFUN(AM_GLIBC,
+AC_DEFUN([AM_GLIBC],
   [
     AC_CACHE_CHECK(whether we are using the GNU C Library,
       ac_cv_gnu_library,
Index: m4/header.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/header.m4,v
retrieving revision 1.4
diff -u -r1.4 header.m4
--- m4/header.m4	25 Sep 2001 13:43:05 -0000	1.4
+++ m4/header.m4	19 Nov 2004 18:36:28 -0000
@@ -15,7 +15,7 @@
 	 m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0]))
 	 dnl prepare to store our destination file list for use in config.status
 	 AC_FOREACH([_AM_File], [$1],
-		    [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*]))
+		    [m4_pushdef([_AM_Dest], patsubst(_AM_File, [:.*]))
 		    m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index))
 		    dnl and add it to the list of files AC keeps track of, along
 		    dnl with our hook
@@ -56,11 +56,11 @@
 # -----------------
 # Like AS_DIRNAME, only do it during macro expansion
 AC_DEFUN([_AM_DIRNAME],
-       [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
-	      m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1,
-		    m4_if(m4_regexp([$1], [^/.*]), -1,
+       [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+	      m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
+		    m4_if(regexp([$1], [^/.*]), -1,
 			  [.],
-			  m4_patsubst([$1], [^\(/\).*], [\1])),
-		    m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
-	      m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+			  patsubst([$1], [^\(/\).*], [\1])),
+		    patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+	      patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
 ]) # _AM_DIRNAME
Index: m4/inttypes_h.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/inttypes_h.m4,v
retrieving revision 1.1
diff -u -r1.1 inttypes_h.m4
--- m4/inttypes_h.m4	8 Feb 2001 05:56:49 -0000	1.1
+++ m4/inttypes_h.m4	19 Nov 2004 18:36:28 -0000
@@ -5,7 +5,7 @@
 # Define HAVE_INTTYPES_H if <inttypes.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN(jm_AC_HEADER_INTTYPES_H,
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
 [
   AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
Index: m4/malloc.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/malloc.m4,v
retrieving revision 1.2
diff -u -r1.2 malloc.m4
--- m4/malloc.m4	13 Mar 2002 13:37:47 -0000	1.2
+++ m4/malloc.m4	19 Nov 2004 18:36:28 -0000
@@ -5,7 +5,7 @@
 dnl If it doesn't, arrange to use the replacement function.
 dnl
 
-AC_DEFUN(jm_FUNC_MALLOC,
+AC_DEFUN([jm_FUNC_MALLOC],
 [
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken malloc -- as it might if this test were omitted.
Index: m4/mbstate_t.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/mbstate_t.m4,v
retrieving revision 1.1
diff -u -r1.1 mbstate_t.m4
--- m4/mbstate_t.m4	2 Apr 2001 18:00:24 -0000	1.1
+++ m4/mbstate_t.m4	19 Nov 2004 18:36:28 -0000
@@ -10,7 +10,7 @@
 # (at least glibc-2.1.3) because the "_XOPEN_SOURCE 500" definition elicits
 # a syntax error in wchar.h due to the use of undefined __int32_t.
 
-AC_DEFUN(AC_MBSTATE_T,
+AC_DEFUN([AC_MBSTATE_T],
   [
    AC_CHECK_HEADERS(stdlib.h)
 
Index: m4/realloc.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/realloc.m4,v
retrieving revision 1.2
diff -u -r1.2 realloc.m4
--- m4/realloc.m4	13 Mar 2002 13:37:47 -0000	1.2
+++ m4/realloc.m4	19 Nov 2004 18:36:28 -0000
@@ -5,7 +5,7 @@
 dnl If it doesn't, arrange to use the replacement function.
 dnl
 
-AC_DEFUN(jm_FUNC_REALLOC,
+AC_DEFUN([jm_FUNC_REALLOC],
 [
  dnl xmalloc.c requires that this symbol be defined so it doesn't
  dnl mistakenly use a broken realloc -- as it might if this test were omitted.
Index: m4/regex.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/regex.m4,v
retrieving revision 1.9
diff -u -r1.9 regex.m4
--- m4/regex.m4	13 Mar 2002 13:37:47 -0000	1.9
+++ m4/regex.m4	19 Nov 2004 18:36:28 -0000
@@ -5,7 +5,7 @@
 
 dnl Usage: jm_INCLUDED_REGEX([lib/regex.c])
 dnl
-AC_DEFUN(jm_INCLUDED_REGEX,
+AC_DEFUN([jm_INCLUDED_REGEX],
   [
     dnl Even packages that don't use regex.c can use this macro.
     dnl Of course, for them it doesn't do anything.
Index: m4/uintmax_t.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/uintmax_t.m4,v
retrieving revision 1.1
diff -u -r1.1 uintmax_t.m4
--- m4/uintmax_t.m4	8 Feb 2001 05:56:49 -0000	1.1
+++ m4/uintmax_t.m4	19 Nov 2004 18:36:28 -0000
@@ -7,7 +7,7 @@
 # Define uintmax_t to `unsigned long' or `unsigned long long'
 # if <inttypes.h> does not exist.
 
-AC_DEFUN(jm_AC_TYPE_UINTMAX_T,
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
 [
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
   if test $jm_ac_cv_header_inttypes_h = no; then
Index: m4/ulonglong.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/ulonglong.m4,v
retrieving revision 1.1
diff -u -r1.1 ulonglong.m4
--- m4/ulonglong.m4	8 Feb 2001 05:56:49 -0000	1.1
+++ m4/ulonglong.m4	19 Nov 2004 18:36:28 -0000
@@ -2,7 +2,7 @@
 
 dnl From Paul Eggert.
 
-AC_DEFUN(jm_AC_TYPE_UNSIGNED_LONG_LONG,
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
 [
   AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
   [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;],
Index: m4/xstrtoumax.m4
===================================================================
RCS file: /cvsroot/grep/grep/m4/xstrtoumax.m4,v
retrieving revision 1.1
diff -u -r1.1 xstrtoumax.m4
--- m4/xstrtoumax.m4	8 Feb 2001 05:56:49 -0000	1.1
+++ m4/xstrtoumax.m4	19 Nov 2004 18:36:28 -0000
@@ -2,7 +2,7 @@
 
 # autoconf tests required for use of xstrtoumax.c
 
-AC_DEFUN(jm_AC_PREREQ_XSTRTOUMAX,
+AC_DEFUN([jm_AC_PREREQ_XSTRTOUMAX],
 [
   AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
   AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])