--- configure	2020-07-09 12:30:11.000000000 -0500
+++ configure	2021-08-04 23:04:48.496040000 -0500
@@ -18642,7 +18642,7 @@
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then
               found_dir="$additional_libdir"
               found_so="$additional_libdir/lib$name.$shlibext"
               if test -f "$additional_libdir/lib$name.la"; then
@@ -22122,7 +22122,7 @@
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test "${enable_static_fd+set}" != set; then
               found_dir="$additional_libdir"
               found_so="$additional_libdir/lib$name.$shlibext"
               if test -f "$additional_libdir/lib$name.la"; then
@@ -23610,7 +23610,7 @@
 done
 
 
-ac_fn_c_check_header_mongrel "$LINENO" "cephfs/ceph_statx.h" "ac_cv_header_cephfs_ceph_statx_h" "$ac_includes_default"
+ac_fn_c_check_header_mongrel "$LINENO" "cephfs/ceph_ll_client.h" "ac_cv_header_cephfs_ceph_statx_h" "$ac_includes_default"
 if test "x$ac_cv_header_cephfs_ceph_statx_h" = xyes; then :
 
 $as_echo "#define HAVE_CEPHFS_CEPH_STATX_H 1" >>confdefs.h
@@ -32518,9 +32518,9 @@
    #
    # Make sure the $with_glusterfs_directory also makes sense
    #
-   if test -d "${with_glusterfs_directory}/lib" -a -d "${with_glusterfs_directory}/include"; then
+   if test -d "${with_glusterfs_directory}/lib" -a -d "${with_glusterfs_directory}/include/glusterfs"; then
       GLUSTER_LIBS="-L${with_glusterfs_directory}/lib ${GLUSTER_LIBS}"
-      GLUSTER_INC="-I${with_glusterfs_directory}/include ${GLUSTER_INC}"
+      GLUSTER_INC="-I${with_glusterfs_directory}/include/glusterfs ${GLUSTER_INC}"
    fi
 else
    GLUSTER_INC="-I/usr/include/glusterfs"
