From 8fb53b51553f27cc666dc491f3e24ce1b39c9437 Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Tue, 25 May 2010 13:09:05 -0700 Subject: [PATCH 1/1] configure fixes --- configure | 7 +++++-- configure.in | 4 +++- m4/ruby.m4 | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 6a86e25..4bba197 100755 --- a/configure +++ b/configure @@ -2452,7 +2452,7 @@ fi PACKAGE=swftools -VERSION=2010-02-06-1900 +VERSION=2010-05-20-1815 # ------------------------------------------------------------------ @@ -6694,6 +6694,7 @@ int Init_foobar() { foobar = rb_define_module("foobar"); rb_define_module_function(foobar, "set_foo", foobar_set_foo, 2); + return 0; } int main() {return 0;} EOF @@ -6729,7 +6730,9 @@ if test "x$RUBY_OK" '!=' "xyes";then # fail silently- the most users won't have any need for the # ruby interface anyway else - rubygfx="lib/ruby/Makefile" + if test -f "lib/ruby/Makefile.in";then + rubygfx="lib/ruby/Makefile" + fi fi # ------------------------------------------------------------------ diff --git a/configure.in b/configure.in index d26a100..aa19993 100644 --- a/configure.in +++ b/configure.in @@ -395,7 +395,9 @@ if test "x$RUBY_OK" '!=' "xyes";then # fail silently- the most users won't have any need for the # ruby interface anyway else - rubygfx="lib/ruby/Makefile" + if test -f "lib/ruby/Makefile.in";then + rubygfx="lib/ruby/Makefile" + fi fi # ------------------------------------------------------------------ diff --git a/m4/ruby.m4 b/m4/ruby.m4 index d5cf4a5..9daa03a 100644 --- a/m4/ruby.m4 +++ b/m4/ruby.m4 @@ -64,6 +64,7 @@ int Init_foobar() { foobar = rb_define_module("foobar"); rb_define_module_function(foobar, "set_foo", foobar_set_foo, 2); + return 0; } int main() {return 0;} EOF -- 1.7.10.4