Merge remote branch 't-nelson/automake'

diff --cc lib/socket.c
index 0bed7515561ce09ac8d68baa31077c47744c4307,96bc695c60c105f518d0a56663f0f55cac19be5f..dcbd1c177fd9be1d998399630ad8787be8deb441
--- 1/lib/socket.c
--- 2/lib/socket.c
+++ b/lib/socket.c
@@@ -25,10 -28,10 +28,13 @@@
  #include <rpc/rpc.h>
  #include <rpc/xdr.h>
  #include <arpa/inet.h>
+ #ifdef HAVE_SYS_FILIO_H
+ #include <sys/filio.h>
+ #endif
  #include <sys/ioctl.h>
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netdb.h>
  #include "libnfs.h"
  #include "libnfs-raw.h"
  #include "libnfs-private.h"