Add support for UNICOS getmntent.

diff --git a/ChangeLog b/ChangeLog
index 3bea7199888e3f980b4cafbf806a89fb63e0d9be..ff307620c92cfe9c378b1a392789032af454ffbf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-06  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/autoconf/functions.m4 (AC_FUNC_GETMNTENT): Check libc before
+       looking elsewhere for getmntent.  Problem reported by Mark D. Baushke.
+       * doc/autoconf.texi (Particular Functions): Mention new behavior.
+
 2004-12-03  Stepan Kasal  <kasal@ucw.cz>
 
        * lib/autoconf/general.m4 (AC_DEFINE, AC_DEFINE_UNQUOTED): Factor

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 637288c78c71473325bff77ad63ad0161dd59731..3d9de89479e90da5120b99e92b473f86fd7b893b 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -4127,8 +4127,9 @@ program.
 @cvindex HAVE_GETMNTENT
 @c @fuindex getmntent
 @prindex @code{getmntent}
-Check for @code{getmntent} in the @file{sun}, @file{seq}, and @file{gen}
-libraries, for @sc{irix} 4, PTX, and UnixWare, respectively.  Then, if
+Check for @code{getmntent} in the standard C library, and then in the
+@file{sun}, @file{seq}, and @file{gen} libraries, for @sc{unicos},
+@sc{irix} 4, @sc{ptx}, and UnixWare, respectively.  Then, if
 @code{getmntent} is available, define @code{HAVE_GETMNTENT}.
 @end defmac
 

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index f6e077e1f22af2819f106b144136ce0ef20f7685..0b13023bffc871cb870383260e1d09110f185c2c 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -771,11 +771,11 @@ AU_ALIAS([AC_GETLOADAVG], [AC_FUNC_GETLOADAVG])
 # -----------------
 AN_FUNCTION([getmntent], [AC_FUNC_GETMNTENT])
 AC_DEFUN([AC_FUNC_GETMNTENT],
-[# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
-AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS",
-  [AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS",
-    [AC_CHECK_LIB(gen, getmntent, LIBS="-lgen $LIBS")])])
-AC_CHECK_FUNCS(getmntent)
+[# getmntent is in the standard C library on UNICOS, in -lsun on Irix 4,
+# -lseq on Dynix/PTX, -lgen on Unixware.
+AC_SEARCH_LIBS(getmntent, -lsun -lseq -lgen,
+  [AC_DEFINE([HAVE_GETMNTENT], 1,
+     [Define to 1 if you have the `getmntent' function.])])
 ])