(gl_GETADDRINFO): Look for getservbyname in these

[gnulib.git] / m4 / ls-mntd-fs.m4

diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index 64ce1f1..ed24386 100644 (file)
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -1,23 +1,68 @@
-#serial 2
+#serial 20
+# How to list mounted file systems.
+
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+# Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.

 
 dnl From Jim Meyering.
 dnl
 dnl This is not pretty.  I've just taken the autoconf code and wrapped
 
 dnl From Jim Meyering.
 dnl
 dnl This is not pretty.  I've just taken the autoconf code and wrapped

-dnl it in an AC_DEFUN.
-dnl
-dnl CAUTION: This is very fragile.  It relies on several checks that
-dnl are still in fileutils' configure.in:
-dnl FIXME: add AC_REQUIRE uses to pull in all definitions required
-dnl for all uses of $ac_cv_func_* and $ac_cv_header_* variables below.
+dnl it in an AC_DEFUN and made some other fixes.

 dnl
 
 dnl
 

-AC_DEFUN(jm_LIST_MOUNTED_FILESYSTEMS,
+# Replace Autoconf's AC_FUNC_GETMNTENT to work around a bug in Autoconf
+# through Autoconf 2.59.  We can remove this once we assume Autoconf 2.60
+# or later.
+AC_DEFUN([AC_FUNC_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, [sun seq gen], [AC_CHECK_FUNCS(getmntent)])
+])
+
+# gl_LIST_MOUNTED_FILE_SYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+AC_DEFUN([gl_LIST_MOUNTED_FILE_SYSTEMS],

   [
   [

-# Determine how to get the list of mounted filesystems.
-list_mounted_fs=
+AC_CHECK_FUNCS(listmntent getmntinfo)
+AC_CHECK_HEADERS_ONCE(sys/param.h)
+
+# We must include grp.h before ucred.h on OSF V4.0, since ucred.h uses
+# NGROUPS (as the array dimension for a struct member) without a definition.
+AC_CHECK_HEADERS(sys/ucred.h, [], [], [#include <grp.h>])
+
+AC_CHECK_HEADERS(sys/mount.h, [], [],
+  [AC_INCLUDES_DEFAULT
+   [#if HAVE_SYS_PARAM_H
+     #include <sys/param.h>
+    #endif]])
+
+AC_CHECK_HEADERS(mntent.h sys/fs_types.h)
+    getfsstat_includes="\
+$ac_includes_default
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h> /* needed by powerpc-apple-darwin1.3.7 */
+#endif
+#if HAVE_SYS_UCRED_H
+# include <grp.h> /* needed for definition of NGROUPS */
+# include <sys/ucred.h> /* needed by powerpc-apple-darwin1.3.7 */
+#endif
+#if HAVE_SYS_MOUNT_H
+# include <sys/mount.h>
+#endif
+#if HAVE_SYS_FS_TYPES_H
+# include <sys/fs_types.h> /* needed by powerpc-apple-darwin1.3.7 */
+#endif
+"
+AC_CHECK_MEMBERS([struct fsstat.f_fstypename],,,[$getfsstat_includes])
+
+# Determine how to get the list of mounted file systems.
+ac_list_mounted_fs=

 
 # If the getmntent function is available but not in the standard library,
 
 # If the getmntent function is available but not in the standard library,

-# make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
+# make sure LIBS contains the appropriate -l option.

 AC_FUNC_GETMNTENT
 
 # This test must precede the ones for getmntent because Unicos-9 is
 AC_FUNC_GETMNTENT
 
 # This test must precede the ones for getmntent because Unicos-9 is


@@ -29,7 +74,7 @@ AC_FUNC_GETMNTENT
 # I think there is too great a chance that some non-Cray system has a
 # function named listmntent to risk the false positive.
 
 # I think there is too great a chance that some non-Cray system has a
 # function named listmntent to risk the false positive.
 

-if test -z "$list_mounted_fs"; then
+if test -z "$ac_list_mounted_fs"; then

   # Cray UNICOS 9
   AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
   AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
   # Cray UNICOS 9
   AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
   AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,


@@ -45,10 +90,27 @@ yes
   )
   AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
   if test $fu_cv_sys_mounted_cray_listmntent = yes; then
   )
   AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
   if test $fu_cv_sys_mounted_cray_listmntent = yes; then

-    list_mounted_fs=found
+    ac_list_mounted_fs=found

     AC_DEFINE(MOUNTED_LISTMNTENT, 1,
       [Define if there is a function named listmntent that can be used to
     AC_DEFINE(MOUNTED_LISTMNTENT, 1,
       [Define if there is a function named listmntent that can be used to

-   list all mounted filesystems. (UNICOS)])
+       list all mounted file systems.  (UNICOS)])
+  fi
+fi
+
+if test -z "$ac_list_mounted_fs"; then
+  # AIX.
+  AC_MSG_CHECKING([for mntctl function and struct vmount])
+  AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
+  [AC_TRY_CPP([#include <fshelp.h>],
+    fu_cv_sys_mounted_vmount=yes,
+    fu_cv_sys_mounted_vmount=no)])
+  AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
+  if test $fu_cv_sys_mounted_vmount = yes; then
+    ac_list_mounted_fs=found
+    AC_DEFINE(MOUNTED_VMOUNT, 1,
+       [Define if there is a function named mntctl that can be used to read
+         the list of mounted file systems, and there is a system header file
+         that declares `struct vmount.'  (AIX)])

   fi
 fi
 
   fi
 fi
 


@@ -57,24 +119,41 @@ if test $ac_cv_func_getmntent = yes; then
   # This system has the getmntent function.
   # Determine whether it's the one-argument variant or the two-argument one.
 
   # This system has the getmntent function.
   # Determine whether it's the one-argument variant or the two-argument one.
 

-  if test -z "$list_mounted_fs"; then
+  if test -z "$ac_list_mounted_fs"; then

     # 4.3BSD, SunOS, HP-UX, Dynix, Irix
     AC_MSG_CHECKING([for one-argument getmntent function])
     AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
     # 4.3BSD, SunOS, HP-UX, Dynix, Irix
     AC_MSG_CHECKING([for one-argument getmntent function])
     AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,

-                [test $ac_cv_header_mntent_h = yes \
-                  && fu_cv_sys_mounted_getmntent1=yes \
-                  || fu_cv_sys_mounted_getmntent1=no])
+                [AC_TRY_COMPILE([
+/* SunOS 4.1.x /usr/include/mntent.h needs this for FILE */
+#include <stdio.h>
+
+#include <mntent.h>
+#if !defined MOUNTED
+# if defined _PATH_MOUNTED     /* GNU libc  */
+#  define MOUNTED _PATH_MOUNTED
+# endif
+# if defined MNT_MNTTAB        /* HP-UX.  */
+#  define MOUNTED MNT_MNTTAB
+# endif
+# if defined MNTTABNAME        /* Dynix.  */
+#  define MOUNTED MNTTABNAME
+# endif
+#endif
+],
+                    [ struct mntent *mnt = 0; char *table = MOUNTED; ],
+                   fu_cv_sys_mounted_getmntent1=yes,
+                   fu_cv_sys_mounted_getmntent1=no)])

     AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
     if test $fu_cv_sys_mounted_getmntent1 = yes; then
     AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
     if test $fu_cv_sys_mounted_getmntent1 = yes; then

-      list_mounted_fs=found
+      ac_list_mounted_fs=found

       AC_DEFINE(MOUNTED_GETMNTENT1, 1,
       AC_DEFINE(MOUNTED_GETMNTENT1, 1,

-  [Define if there is a function named getmntent for reading the list
-   of mounted filesystems, and that function takes a single argument.
-   (4.3BSD, SunOS, HP-UX, Dynix, Irix)])
+        [Define if there is a function named getmntent for reading the list
+         of mounted file systems, and that function takes a single argument.
+         (4.3BSD, SunOS, HP-UX, Dynix, Irix)])

     fi
   fi
 
     fi
   fi
 

-  if test -z "$list_mounted_fs"; then
+  if test -z "$ac_list_mounted_fs"; then

     # SVR4
     AC_MSG_CHECKING([for two-argument getmntent function])
     AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
     # SVR4
     AC_MSG_CHECKING([for two-argument getmntent function])
     AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,


@@ -83,58 +162,45 @@ if test $ac_cv_func_getmntent = yes; then
       fu_cv_sys_mounted_getmntent2=no)])
     AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
     if test $fu_cv_sys_mounted_getmntent2 = yes; then
       fu_cv_sys_mounted_getmntent2=no)])
     AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
     if test $fu_cv_sys_mounted_getmntent2 = yes; then

-      list_mounted_fs=found
+      ac_list_mounted_fs=found

       AC_DEFINE(MOUNTED_GETMNTENT2, 1,
       AC_DEFINE(MOUNTED_GETMNTENT2, 1,

-  [Define if there is a function named getmntent for reading the list of
-   mounted filesystems, and that function takes two arguments.  (SVR4)])
+        [Define if there is a function named getmntent for reading the list of
+         mounted file systems, and that function takes two arguments.  (SVR4)])

     fi
   fi
 
     fi
   fi
 

-  if test -z "$list_mounted_fs"; then
-    AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-  fi
-

 fi
 
 fi
 

-if test -z "$list_mounted_fs"; then
-  # DEC Alpha running OSF/1.
+if test -z "$ac_list_mounted_fs"; then
+  # DEC Alpha running OSF/1, and Apple Darwin 1.3.
+  # powerpc-apple-darwin1.3.7 needs sys/param.h sys/ucred.h sys/fs_types.h
+

   AC_MSG_CHECKING([for getfsstat function])
   AC_MSG_CHECKING([for getfsstat function])

-  AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
+  AC_CACHE_VAL(fu_cv_sys_mounted_getfsstat,

   [AC_TRY_LINK([
 #include <sys/types.h>
   [AC_TRY_LINK([
 #include <sys/types.h>

-#include <sys/mount.h>
-#include <sys/fs_types.h>],
+#if HAVE_STRUCT_FSSTAT_F_FSTYPENAME
+# define FS_TYPE(Ent) ((Ent).f_fstypename)
+#else
+# define FS_TYPE(Ent) mnt_names[(Ent).f_type]
+#endif
+]$getfsstat_includes
+,

   [struct statfs *stats;
   [struct statfs *stats;

-  int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
-    fu_cv_sys_mounted_getsstat=yes,
-    fu_cv_sys_mounted_getsstat=no)])
-  AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
-  if test $fu_cv_sys_mounted_getsstat = yes; then
-    list_mounted_fs=found
+   int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT);
+   char *t = FS_TYPE (*stats); ],
+    fu_cv_sys_mounted_getfsstat=yes,
+    fu_cv_sys_mounted_getfsstat=no)])
+  AC_MSG_RESULT($fu_cv_sys_mounted_getfsstat)
+  if test $fu_cv_sys_mounted_getfsstat = yes; then
+    ac_list_mounted_fs=found

     AC_DEFINE(MOUNTED_GETFSSTAT, 1,
              [Define if there is a function named getfsstat for reading the
     AC_DEFINE(MOUNTED_GETFSSTAT, 1,
              [Define if there is a function named getfsstat for reading the

-   list of mounted filesystems.  (DEC Alpha running OSF/1)])
-  fi
-fi
-
-if test -z "$list_mounted_fs"; then
-  # AIX.
-  AC_MSG_CHECKING([for mntctl function and struct vmount])
-  AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
-  [AC_TRY_CPP([#include <fshelp.h>],
-    fu_cv_sys_mounted_vmount=yes,
-    fu_cv_sys_mounted_vmount=no)])
-  AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
-  if test $fu_cv_sys_mounted_vmount = yes; then
-    list_mounted_fs=found
-    AC_DEFINE(MOUNTED_VMOUNT, 1,
-       [Define if there is a function named mntctl that can be used to read
-   the list of mounted filesystems, and there is a system header file
-   that declares \`struct vmount.'  (AIX)])
+               list of mounted file systems.  (DEC Alpha running OSF/1)])

   fi
 fi
 
   fi
 fi
 

-if test -z "$list_mounted_fs"; then
+if test -z "$ac_list_mounted_fs"; then

   # SVR3
   AC_MSG_CHECKING([for FIXME existence of three headers])
   AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
   # SVR3
   AC_MSG_CHECKING([for FIXME existence of three headers])
   AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,


@@ -146,40 +212,33 @@ if test -z "$list_mounted_fs"; then
                fu_cv_sys_mounted_fread_fstyp=no)])
   AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
   if test $fu_cv_sys_mounted_fread_fstyp = yes; then
                fu_cv_sys_mounted_fread_fstyp=no)])
   AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
   if test $fu_cv_sys_mounted_fread_fstyp = yes; then

-    list_mounted_fs=found
+    ac_list_mounted_fs=found

     AC_DEFINE(MOUNTED_FREAD_FSTYP, 1,
     AC_DEFINE(MOUNTED_FREAD_FSTYP, 1,

-[Define if (like SVR2) there is no specific function for reading the
-   list of mounted filesystems, and your system has these header files:
-   <sys/fstyp.h> and <sys/statfs.h>.  (SVR3)])
+      [Define if (like SVR2) there is no specific function for reading the
+       list of mounted file systems, and your system has these header files:
+       <sys/fstyp.h> and <sys/statfs.h>.  (SVR3)])

   fi
 fi
 
   fi
 fi
 

-if test -z "$list_mounted_fs"; then
+if test -z "$ac_list_mounted_fs"; then

   # 4.4BSD and DEC OSF/1.
   AC_MSG_CHECKING([for getmntinfo function])
   AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
     [
   # 4.4BSD and DEC OSF/1.
   AC_MSG_CHECKING([for getmntinfo function])
   AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
     [

-      ok=
-      if test $ac_cv_func_getmntinfo = yes; then
-       AC_EGREP_HEADER(f_type;, sys/mount.h,
-                       ok=yes)
-      fi
-      test -n "$ok" \
+      test "$ac_cv_func_getmntinfo" = yes \

          && fu_cv_sys_mounted_getmntinfo=yes \
          || fu_cv_sys_mounted_getmntinfo=no
     ])
   AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
   if test $fu_cv_sys_mounted_getmntinfo = yes; then
          && fu_cv_sys_mounted_getmntinfo=yes \
          || fu_cv_sys_mounted_getmntinfo=no
     ])
   AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
   if test $fu_cv_sys_mounted_getmntinfo = yes; then

-    list_mounted_fs=found
+    ac_list_mounted_fs=found

     AC_DEFINE(MOUNTED_GETMNTINFO, 1,
              [Define if there is a function named getmntinfo for reading the
     AC_DEFINE(MOUNTED_GETMNTINFO, 1,
              [Define if there is a function named getmntinfo for reading the

-   list of mounted filesystems.  (4.4BSD)])
+               list of mounted file systems.  (4.4BSD, Darwin)])

   fi
 fi
 
   fi
 fi
 

-# FIXME: add a test for netbsd-1.1 here
-
-if test -z "$list_mounted_fs"; then
+if test -z "$ac_list_mounted_fs"; then

   # Ultrix
   AC_MSG_CHECKING([for getmnt function])
   AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
   # Ultrix
   AC_MSG_CHECKING([for getmnt function])
   AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,


@@ -190,14 +249,35 @@ if test -z "$list_mounted_fs"; then
                fu_cv_sys_mounted_getmnt=no)])
   AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
   if test $fu_cv_sys_mounted_getmnt = yes; then
                fu_cv_sys_mounted_getmnt=no)])
   AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
   if test $fu_cv_sys_mounted_getmnt = yes; then

-    list_mounted_fs=found
+    ac_list_mounted_fs=found

     AC_DEFINE(MOUNTED_GETMNT, 1,
       [Define if there is a function named getmnt for reading the list of
     AC_DEFINE(MOUNTED_GETMNT, 1,
       [Define if there is a function named getmnt for reading the list of

-   mounted filesystems.  (Ultrix)])
+       mounted file systems.  (Ultrix)])
+  fi
+fi
+
+if test -z "$ac_list_mounted_fs"; then
+  # BeOS
+  AC_CHECK_FUNCS(next_dev fs_stat_dev)
+  AC_CHECK_HEADERS(fs_info.h)
+  AC_MSG_CHECKING([for BEOS mounted file system support functions])
+  if test $ac_cv_header_fs_info_h = yes \
+      && test $ac_cv_func_next_dev = yes \
+       && test $ac_cv_func_fs_stat_dev = yes; then
+    fu_result=yes
+  else
+    fu_result=no
+  fi
+  AC_MSG_RESULT($fu_result)
+  if test $fu_result = yes; then
+    ac_list_mounted_fs=found
+    AC_DEFINE(MOUNTED_FS_STAT_DEV, 1,
+      [Define if there are functions named next_dev and fs_stat_dev for
+       reading the list of mounted file systems.  (BeOS)])

   fi
 fi
 
   fi
 fi
 

-if test -z "$list_mounted_fs"; then
+if test -z "$ac_list_mounted_fs"; then

   # SVR2
   AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
   AC_CACHE_VAL(fu_cv_sys_mounted_fread,
   # SVR2
   AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
   AC_CACHE_VAL(fu_cv_sys_mounted_fread,


@@ -206,17 +286,20 @@ if test -z "$list_mounted_fs"; then
                fu_cv_sys_mounted_fread=no)])
   AC_MSG_RESULT($fu_cv_sys_mounted_fread)
   if test $fu_cv_sys_mounted_fread = yes; then
                fu_cv_sys_mounted_fread=no)])
   AC_MSG_RESULT($fu_cv_sys_mounted_fread)
   if test $fu_cv_sys_mounted_fread = yes; then

-    list_mounted_fs=found
+    ac_list_mounted_fs=found

     AC_DEFINE(MOUNTED_FREAD, 1,
              [Define if there is no specific function for reading the list of
     AC_DEFINE(MOUNTED_FREAD, 1,
              [Define if there is no specific function for reading the list of

-   mounted filesystems.  fread will be used to read /etc/mnttab.  (SVR2) ])
+               mounted file systems.  fread will be used to read /etc/mnttab.
+               (SVR2) ])

   fi
 fi
 
   fi
 fi
 

-if test -z "$list_mounted_fs"; then
-  AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+if test -z "$ac_list_mounted_fs"; then
+  AC_MSG_ERROR([could not determine how to read list of mounted file systems])

   # FIXME -- no need to abort building the whole package
   # Can't build mountlist.c or anything that needs its functions
 fi
 
   # FIXME -- no need to abort building the whole package
   # Can't build mountlist.c or anything that needs its functions
 fi
 

+AS_IF([test $ac_list_mounted_fs = found], [$1], [$2])
+

   ])
   ])