diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | ruby/Rakefile.in | 2 | ||||
| -rw-r--r-- | ruby/ext/guestfs/extconf.rb | 5 |
3 files changed, 6 insertions, 2 deletions
@@ -202,6 +202,7 @@ regressions/test.err regressions/test.out ruby/bindtests.rb ruby/ext/guestfs/extconf.h +ruby/ext/guestfs/_guestfs.bundle ruby/ext/guestfs/_guestfs.c ruby/ext/guestfs/_guestfs.so ruby/ext/guestfs/mkmf.log diff --git a/ruby/Rakefile.in b/ruby/Rakefile.in index a0002553..e77b0ebd 100644 --- a/ruby/Rakefile.in +++ b/ruby/Rakefile.in @@ -38,7 +38,7 @@ CLOBBER.include [ "@builddir@/config.save", "@builddir@/ext/**/mkmf.log", # Build locally file MAKEFILE => EXT_CONF do |t| - unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs" + unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_guestfs-include=$top_srcdir/src --with-_guestfs-lib=$top_builddir/src/.libs" $stderr.puts "Failed to run extconf" break end diff --git a/ruby/ext/guestfs/extconf.rb b/ruby/ext/guestfs/extconf.rb index 67389fd5..3413e040 100644 --- a/ruby/ext/guestfs/extconf.rb +++ b/ruby/ext/guestfs/extconf.rb @@ -22,7 +22,10 @@ extension_name = '_guestfs' dir_config(extension_name) -unless have_library("guestfs", "guestfs_create") +unless have_header ("guestfs.h") + raise "<guestfs.h> not found" +end +unless have_library("guestfs", "guestfs_create", "guestfs.h") raise "libguestfs not found" end |