diff --git a/ChangeLog b/ChangeLog
index c7824cc3..0cedd900 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-22  Jim Meyering  <meyering@lucent.com>
+
+	* actypes.m4 (AC_TYPE_GETGROUPS): Double quote the test program
+	body.
+
 2001-01-22  Tim Van Holder  <tim.van.holder@pandora.be>
 
 	* aclang.m4 (AC_LANG_INT_SAVE, AC_LANG_INT_SAVE(C)): Use
diff --git a/acfunctions.m4 b/acfunctions.m4
index ae57ff23..48c171be 100644
--- a/acfunctions.m4
+++ b/acfunctions.m4
@@ -420,8 +420,8 @@ fi
 if test $ac_cv_func_getgroups = yes; then
   AC_CACHE_CHECK([for working getgroups], ac_cv_func_getgroups_works,
    [AC_RUN_IFELSE([AC_LANG_PROGRAM([],
-      [/* On Ultrix 4.3, getgroups (0, 0) always fails.  */
-       exit (getgroups (0, 0) == -1 ? 1 : 0);])],
+      [[/* On Ultrix 4.3, getgroups (0, 0) always fails.  */
+       exit (getgroups (0, 0) == -1 ? 1 : 0);])]],
                   [ac_cv_func_getgroups_works=yes],
                   [ac_cv_func_getgroups_works=no],
                   [ac_cv_func_getgroups_works=no])
diff --git a/actypes.m4 b/actypes.m4
index 24bf2c9a..968d1373 100644
--- a/actypes.m4
+++ b/actypes.m4
@@ -246,11 +246,12 @@ AC_DEFUN([AC_TYPE_GETGROUPS],
 [AC_REQUIRE([AC_TYPE_UID_T])dnl
 AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
 [AC_RUN_IFELSE([AC_LANG_SOURCE(
-[/* Thanks to Mike Rendell for this test.  */
+[[/* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
 #define NGID 256
 #undef MAX
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
+
 int
 main ()
 {
@@ -266,7 +267,7 @@ main ()
   /* Exit non-zero if getgroups seems to require an array of ints.  This
      happens when gid_t is short but getgroups modifies an array of ints.  */
   exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
-}])],
+}]])],
                [ac_cv_type_getgroups=gid_t],
                [ac_cv_type_getgroups=int],
                [ac_cv_type_getgroups=cross])
diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index ae57ff23..48c171be 100644
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -420,8 +420,8 @@ fi
 if test $ac_cv_func_getgroups = yes; then
   AC_CACHE_CHECK([for working getgroups], ac_cv_func_getgroups_works,
    [AC_RUN_IFELSE([AC_LANG_PROGRAM([],
-      [/* On Ultrix 4.3, getgroups (0, 0) always fails.  */
-       exit (getgroups (0, 0) == -1 ? 1 : 0);])],
+      [[/* On Ultrix 4.3, getgroups (0, 0) always fails.  */
+       exit (getgroups (0, 0) == -1 ? 1 : 0);])]],
                   [ac_cv_func_getgroups_works=yes],
                   [ac_cv_func_getgroups_works=no],
                   [ac_cv_func_getgroups_works=no])
diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index 24bf2c9a..968d1373 100644
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -246,11 +246,12 @@ AC_DEFUN([AC_TYPE_GETGROUPS],
 [AC_REQUIRE([AC_TYPE_UID_T])dnl
 AC_CACHE_CHECK(type of array argument to getgroups, ac_cv_type_getgroups,
 [AC_RUN_IFELSE([AC_LANG_SOURCE(
-[/* Thanks to Mike Rendell for this test.  */
+[[/* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
 #define NGID 256
 #undef MAX
 #define MAX(x, y) ((x) > (y) ? (x) : (y))
+
 int
 main ()
 {
@@ -266,7 +267,7 @@ main ()
   /* Exit non-zero if getgroups seems to require an array of ints.  This
      happens when gid_t is short but getgroups modifies an array of ints.  */
   exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
-}])],
+}]])],
                [ac_cv_type_getgroups=gid_t],
                [ac_cv_type_getgroups=int],
                [ac_cv_type_getgroups=cross])