more osf getmntent_r() patches

CVS patchset: 1712
CVS date: 1997/06/25 16:10:19

diff --git a/config.h.in b/config.h.in
index 07b32bf..45e9207 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -77,23 +77,26 @@
 /* Define as 1 if you have lchown() */
 #define HAVE_LCHOWN 0
 
-/* Define as one if you have <mntent.h> */
+/* Define as 1 if you have <mntent.h> */
 #define HAVE_MNTENT_H 0
 
-/* Define as one if you have <sys/mnttab.h> */
+/* Define as 1 if you have <sys/mnttab.h> */
 #define HAVE_SYS_MNTTAB_H 0
 
-/* Define as one if you have getmntent(), you'll also need one of the above
+/* Define as 1 if you have getmntent(), you'll also need one of the above
    two defined */
 #define HAVE_GETMNTENT 0
 
-/* Define as one if you have mntctl() (only aix?) */
+/* Define as 1 if you have mntctl() (only aix?) */
 #define HAVE_MNTCTL 0
 
-/* Define as one if you have "struct mnttab" (only sco?) */
+/* Define as 1 if you have "struct mnttab" (only sco?) */
 #define HAVE_STRUCT_MNTTAB 0
 
-/* Define as one if you have getmntinfo_r() (only osf?) */
+/* Define as 1 if you have getmntinfo_r() (only osf?) */
 #define HAVE_GETMNTINFO_R 0
 
+/* Define as 1 if you have <sys/sysconfig.h> (only aix?) */
+#define HAVE_SYS_SYSTEMCFG_H 0
+
 #endif

diff --git a/configure.in b/configure.in
index 2a92e2e..d394315 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -220,7 +220,7 @@ AC_HEADER_MAJOR
 AC_CHECK_HEADERS(netinet/in_systm.h limits.h)
 AC_CHECK_HEADERS(alloca.h dirent.h sys/socket.h sys/select.h)
 AC_CHECK_HEADERS(machine/types.h string.h)
-AC_CHECK_HEADERS(mntent.h sys/mnttab.h)
+AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/systemcfg.h)
 AC_CHECK_HEADERS(glob.h,,MISCOBJS="$MISCOBJS glob.o")
 AC_CHECK_HEADERS(fnmatch.h,,MISCOBJS="$MISCOBJS fnmatch.o")
 
@@ -278,9 +278,11 @@ dnl Checks for library functions.
 AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), MISCOBJS="$MISCOBJS inet_aton.o")
 AC_CHECK_FUNC(realpath, AC_DEFINE(HAVE_REALPATH), MISCOBJS="$MISCOBJS realpath.o")
 AC_CHECK_FUNC(getmntent, AC_DEFINE(HAVE_GETMNTENT), [
-   AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL),[
-       AC_CHECK_FUNC(getmntinfo_r, AC_DEFINE(HAVE_GETMNTINFO_R),
-                 MISCOBJS="$MISCOBJS getmntent.o") ])])
+  AC_CHECK_FUNC(mntctl, AC_DEFINE(HAVE_MNTCTL),[
+    AC_CHECK_FUNC(getmntinfo_r, AC_DEFINE(HAVE_GETMNTINFO_R), [
+      AC_CHECK_LIB(c_r, getmntinfo_r, [LIBS="-lc_r $LIBS"; 
+                                       AC_DEFINE(HAVE_GETMNTINFO_R)],
+                 MISCOBJS="$MISCOBJS getmntent.o")])])])
 AC_CHECK_FUNC(strerror, [], MISCOBJS="$MISCOBJS strerror.o")
 AC_CHECK_FUNC(strtol, [], MISCOBJS="$MISCOBJS strtol.o")
 AC_CHECK_FUNC(strtoul, [], MISCOBJS="$MISCOBJS strtoul.o")

diff --git a/misc/miscfn.h b/misc/miscfn.h
index 80a5194..791ae50 100644 (file)
--- a/misc/miscfn.h
+++ b/misc/miscfn.h
@@ -65,6 +65,7 @@ extern void *myrealloc(void *, size_t);
 #if HAVE_GETMNTINFO_R || HAVE_MNTCTL
 # define GETMNTENT_ONE 0
 # define GETMNTENT_TWO 0
+# include <sys/mount.h>
 #elif HAVE_MNTENT_H || !(HAVE_GETMNTENT) || HAVE_STRUCT_MNTTAB
 # if HAVE_MNTENT_H || HAVE_STRUCT_MNTTAB
 #  include <mntent.h>