added check for mntent.h, mount.h (probable replacement), conditional include...

added check for mntent.h, mount.h (probable replacement), conditional include of mntent.h. this cleans a couple of things up, but reported
bug still remains.


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@336 3b7491f3-a168-0410-bf4b-c445ed680a29

configure.in

 dnl **************************************************************
-dnl PVFS2 AUTOCONF SCRIPT
+dnl DARSHAN AUTOCONF SCRIPT
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl You may need to use autoheader as well if changing any DEFINEs
@@ -102,7 +102,7 @@ AC_TRY_COMPILE([#include <mpi.h>], [int ret = MPI_Init(0, (void*)0)],
 )
 
 dnl temporarily set large file flags just for this test; we don't want
-dnl it to propigate to the makefile because of zlib bugs
+dnl it to propagate to the makefile because of zlib bugs
 old_cflags="$CFLAGS"
 CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
 AC_MSG_CHECKING(for off64_t)
@@ -131,6 +131,7 @@ AC_TRY_COMPILE(
 )
 CFLAGS="$old_cflags"
 
+AC_CHECK_HEADERS(mntent.h sys/mount.h)
 
 # libc functions wrapped by darshan
 CP_WRAPPERS="-Wl,-u,MPI_Wtime,-wrap,write,-wrap,open,-wrap,creat,-wrap,creat64,-wrap,open64,-wrap,close,-wrap,read,-wrap,lseek,-wrap,lseek64,-wrap,pread,-wrap,pwrite,-wrap,readv,-wrap,writev,-wrap,__xstat,-wrap,__lxstat,-wrap,__fxstat,-wrap,__xstat64,-wrap,__lxstat64,-wrap,__fxstat64,-wrap,mmap,-wrap,mmap64,-wrap,fopen,-wrap,fclose,-wrap,fread,-wrap,fwrite,-wrap,fseek,-wrap,fopen64,-wrap,pread64,-wrap,pwrite64,-wrap,fsync,-wrap,fdatasync,-wrap,ncmpi_create,-wrap,ncmpi_open,-wrap,ncmpi_close,-wrap,H5Fcreate,-wrap,H5Fopen,-wrap,H5Fclose"

darshan-config.h.in

@@ -15,6 +15,9 @@
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
+/* Define to 1 if you have the <mntent.h> header file. */
+#undef HAVE_MNTENT_H
+
 /* Define if off64_t type is defined */
 #undef HAVE_OFF64_T
 
@@ -30,6 +33,9 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
+/* Define to 1 if you have the <sys/mount.h> header file. */
+#undef HAVE_SYS_MOUNT_H
+
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 

lib/darshan-mpi-io.c

@@ -6,8 +6,12 @@
 #define _XOPEN_SOURCE 500
 #define _GNU_SOURCE /* for tdestroy() */
 
+#include "darshan-config.h"
+
 #include <stdio.h>
+#ifdef HAVE_MNTENT_H
 #include <mntent.h>
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -22,7 +26,6 @@
 
 #include "mpi.h"
 #include "darshan.h"
-#include "darshan-config.h"
 
 extern char* __progname;