shulima

diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 0e9a868..e8e5e45 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+DLEXT := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['DLEXT']")
+

shulima

diff --git a/test-data/blank-disks/Makefile.am b/test-data/blank-disks/Makefile.am
index 2464869..ca93189 100644
--- a/test-data/blank-disks/Makefile.am
+++ b/test-data/blank-disks/Makefile.am
@@ -33,21 +33,21 @@ CLEANFILES = $(files)
 # Blank disk images in various sizes and formats.
 blank-disk-1s.raw:
 	rm -f $@
-	truncate -s 512 $@
+	gtruncate -s 512 $@

shulima

diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index 1649884..fae8e5d 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -23,12 +23,14 @@
 #include <stdarg.h>
 #include <stdbool.h>
 #include <unistd.h>
+#include <fcntl.h>
 #include <grp.h>

shulima

diff --git a/tests/test-accept4.c b/tests/test-accept4.c
index b24af0b..e900b48 100644
--- a/tests/test-accept4.c
+++ b/tests/test-accept4.c
@@ -31,6 +31,10 @@ SIGNATURE_CHECK (accept4, int, (int, struct sockaddr *, socklen_t *, int));
 
 #include "macros.h"
 
+#ifndef SOCK_CLOEXEC
+# define SOCK_CLOEXEC 0

shulima

diff --git a/gnulib/lib/error.c b/gnulib/lib/error.c
index 18ff5db..d8c5acb 100644
--- a/gnulib/lib/error.c
+++ b/gnulib/lib/error.c
@@ -113,9 +113,13 @@ int strerror_r ();
 #  endif
 # endif
 
+#if defined __APPLE__ && defined __MACH__
+#define program_name (((char **)*_NSGetArgv())[0])

shulima

diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
index f40770b..fd85d42 100644
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -1399,6 +1399,8 @@ EXTRA_libgnu_la_SOURCES += open.c
 
 ## end   gnulib module open
 
+libgnu_la_SOURCES += open_memstream.c
+

shulima

diff --git a/run.in b/run.in
index a8c2904..bf7ea1b 100755
--- a/run.in
+++ b/run.in
@@ -77,13 +77,10 @@ fi
 PATH="$b/align:$b/builder:$b/cat:$b/customize:$b/df:$b/diff:$b/edit:$b/erlang:$b/fish:$b/format:$b/fuse:$b/inspector:$b/make-fs:$b/p2v:$b/rescue:$b/resize:$b/sparsify:$b/sysprep:$b/test-tool:$b/tools:$b/v2v:$PATH"
 export PATH
 
-# Set LD_LIBRARY_PATH to contain library.
-if [ -z "$LD_LIBRARY_PATH" ]; then

shulima

diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index f605188..d28d77b 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -21,6 +21,8 @@ generator_built = \
 	ext/guestfs/_guestfs.c \
 	bindtests.rb
 
+DLEXT := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['DLEXT']")
+

shulima

diff --git a/src/launch-libvirt.c b/src/launch-libvirt.c
index aaa8501..7ca56cd 100644
--- a/src/launch-libvirt.c
+++ b/src/launch-libvirt.c
@@ -28,6 +28,7 @@
 #include <grp.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/un.h>
 #include <sys/wait.h>

shulima

diff --git a/src/inspect-apps.c b/src/inspect-apps.c
index 836a160..8bf7073 100644
--- a/src/inspect-apps.c
+++ b/src/inspect-apps.c
@@ -35,11 +35,22 @@
 #include <sys/endian.h>
 #endif
 
-/* be32toh is usually a macro definend in <endian.h>, but it might be
+/* be32toh is usually a macro defined in <endian.h>, but it might be