Advertisement
Guest User

Untitled

a guest
Mar 22nd, 2019
67
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.82 KB | None | 0 0
  1. diff --git a/configure b/configure
  2. index 84dce93..3de6e1f 100755
  3. --- a/configure
  4. +++ b/configure
  5. @@ -59469,10 +59469,17 @@ fi
  6. ac_fn_c_check_header_mongrel "$LINENO" "rpc/xdr.h" "ac_cv_header_rpc_xdr_h" "$ac_includes_default"
  7. if test "x$ac_cv_header_rpc_xdr_h" = xyes; then :
  8.  
  9. +else
  10. +
  11. + # on macOS, rpc/types.h can be usuable without a usable rpc/xdr.h
  12. + ac_fn_c_check_header_mongrel "$LINENO" "rpc/types.h" "ac_cv_header_rpc_types_h" "$ac_includes_default"
  13. +if test "x$ac_cv_header_rpc_types_h" = xyes; then :
  14. else
  15.  
  16. as_fn_error $? "XDR header files are required" "$LINENO" 5
  17.  
  18. +fi
  19. +
  20. fi
  21.  
  22.  
  23. diff --git a/daemon/tsk.c b/daemon/tsk.c
  24. index af803d7..3e8aaaa 100644
  25. --- a/daemon/tsk.c
  26. +++ b/daemon/tsk.c
  27. @@ -23,8 +23,8 @@
  28. #include <inttypes.h>
  29. #include <string.h>
  30. #include <unistd.h>
  31. -#include <rpc/xdr.h>
  32. #include <rpc/types.h>
  33. +#include <rpc/xdr.h>
  34.  
  35. #include "guestfs_protocol.h"
  36. #include "daemon.h"
  37. diff --git a/lib/tsk.c b/lib/tsk.c
  38. index 09e514b..cb1dc94 100644
  39. --- a/lib/tsk.c
  40. +++ b/lib/tsk.c
  41. @@ -25,8 +25,8 @@
  42. #include <sys/stat.h>
  43. #include <sys/types.h>
  44. #include <string.h>
  45. -#include <rpc/xdr.h>
  46. #include <rpc/types.h>
  47. +#include <rpc/xdr.h>
  48.  
  49. #include "guestfs.h"
  50. #include "guestfs_protocol.h"
  51. diff --git a/m4/guestfs_libraries.m4 b/m4/guestfs_libraries.m4
  52. index 60f89d4..56add7d 100644
  53. --- a/m4/guestfs_libraries.m4
  54. +++ b/m4/guestfs_libraries.m4
  55. @@ -176,8 +176,12 @@ PKG_CHECK_MODULES([RPC], [libtirpc], [], [
  56. # If we don't have libtirpc, then we must have <rpc/xdr.h> and
  57. # some library to link to in libdir.
  58. RPC_CFLAGS=""
  59. + AC_CHECK_HEADERS(rpc/types.h)
  60. AC_CHECK_HEADER([rpc/xdr.h],[],[
  61. - AC_MSG_ERROR([XDR header files are required])
  62. + AC_MSG_ERROR([XDR header files are required])],
  63. + [#ifdef HAVE_RPC_TYPES_H
  64. + # include <rpc/types.h>
  65. + #endif
  66. ])
  67.  
  68. old_LIBS="$LIBS"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement