From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 6 Dec 2004 21:24:19 +0000 (+0000)
Subject: Add support for UNICOS getmntent.
X-Git-Tag: AUTOCONF-2.59c~585
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3077af0f26fa7b9770cf4eae050349c2868f022b;p=thirdparty%2Fautoconf.git

Add support for UNICOS getmntent.
---

diff --git a/ChangeLog b/ChangeLog
index 3bea71998..ff307620c 100644
--- 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 637288c78..3d9de8947 100644
--- 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 f6e077e1f..0b13023bf 100644
--- 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.])])
 ])