From d6e2e4fcf14ab2b13f01230ad161b03b28365aa3 Mon Sep 17 00:00:00 2001
From: Christos Zoulas <christos@zoulas.com>
Date: Thu, 19 May 2011 22:32:36 -0400
Subject: [PATCH] Fixes for Fedora Core 15 and RHEL 6

---
 ChangeLog            | 12 ++++++++++++
 configure.in         | 15 +++++++++++++++
 m4/macros/libtool.m4 |  4 +++-
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 257e643f..a0a88ffc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-19  Christos Zoulas <christos@zoulas.com>
+
+	* m4/macros/libtool.m4: for AIX AC_LANG_PROGRAM is incorrectly
+	  used and the latest autoconf gives an error. For now just
+	  quote it.
+
+	* configure.in: Fedora Core 15 and RedHat 6 now don't define
+	  af_family_t in <linux/socket.h>, but in <bits/sockaddr.h>.
+	  Include <sys/socket.h> so that we get <bits/sockaddr.h>
+	  indirectly. This caused the <linux/nfs_mount.h> detection
+	  test to fail.
+
 2010-11-24  Erez Zadok  <ezk@fsl.cs.sunysb.edu>
 
 	* m4/macros/os_cflags.m4: for linux, define _GNU_SOURCE (to get
diff --git a/configure.in b/configure.in
index a0beff23..6d51b195 100644
--- a/configure.in
+++ b/configure.in
@@ -666,9 +666,17 @@ AC_CHECK_HEADERS([			\
 # ifndef __KERNEL__
 #  define __KERNEL__
 # endif /* __KERNEL__ */
+/*
+ * It used to be the case that linux/socket.h would define sa_family_t,
+ * but as of FC15, this is not the case anymore (although the comments
+ * in some headers say that is true! So we include <sys/socket.h> too.
+ */
 #ifdef HAVE_LINUX_SOCKET_H
 # include <linux/socket.h>
 #endif /* HAVE_LINUX_SOCKET_H */
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif /* HAVE_SYS_SOCKET_H */
 #ifdef HAVE_LIMITS_H
 # include <limits.h>
 #endif /* HAVE_LIMITS_H */
@@ -676,6 +684,13 @@ AC_CHECK_HEADERS([			\
 # include <linux/posix_types.h>
 #endif /* HAVE_LINUX_POSIX_TYPES_H */
 #ifdef HAVE_LINUX_NFS2_H
+#if !defined(FHSIZE) && defined(NFS2_FHSIZE)
+#define FHSIZE NFS2_FHSIZE
+#endif
+/*
+ * Note that the below test is broken because the brackets get eaten
+ * by autoconf.
+ */
 struct nfs2_fh {
   char data[FHSIZE];
 };
diff --git a/m4/macros/libtool.m4 b/m4/macros/libtool.m4
index 1805a2d0..fa7fd4dd 100644
--- a/m4/macros/libtool.m4
+++ b/m4/macros/libtool.m4
@@ -282,8 +282,10 @@ $rm conftest*
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+#
+# XXX: AC_LANG_PROGRAM is no more valid here, quote it for now.
 AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+[AC_LINK_IFELSE([AC_LANG_PROGRAM],[
 aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
 }'`
 # Check for a 64-bit object if we didn't find anything.
-- 
2.43.0