]>
Commit | Line | Data |
---|---|---|
19d2e237 JB |
1 | --- tomoe-0.6.0/macros/ruby.m4.orig 2007-06-11 03:05:42.000000000 +0200 |
2 | +++ tomoe-0.6.0/macros/ruby.m4 2012-11-12 21:18:04.642203203 +0100 | |
3 | @@ -28,14 +28,15 @@ | |
4 | ||
5 | changequote(<<, >>) | |
6 | for var_name in archdir sitearchdir CFLAGS LIBRUBYARG libdir \ | |
7 | - sitelibdir sitearchdir; do | |
8c7e6420 | 8 | - rbconfig_tmp=`$rbconfig "print Config::CONFIG['$var_name']"` |
22d315e6 | 9 | + vendorlibdir vendorarchdir rubyhdrdir sitehdrdir arch; do |
8c7e6420 | 10 | + rbconfig_tmp=`$rbconfig "print RbConfig::CONFIG['$var_name']"` |
19d2e237 JB |
11 | eval "rbconfig_$var_name=\"$rbconfig_tmp\"" |
12 | done | |
13 | + rbconfig_archhdrdir="$rbconfig_rubyhdrdir/$rbconfig_arch" | |
14 | changequote([, ]) | |
15 | ||
16 | - RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir " | |
17 | - RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_sitearchdir " | |
18 | + RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_archdir -I$rbconfig_rubyhdrdir -I$rbconfig_archhdrdir" | |
22d315e6 | 19 | + RUBY_CFLAGS="$RUBY_CFLAGS -I$rbconfig_vendorarchdir -I$rbconfig_vendorhdrdir" |
19d2e237 JB |
20 | RUBY_CFLAGS="$RUBY_CFLAGS $rbconfig_CFLAGS " |
21 | RUBY_LIBS="$rbconfig_LIBRUBYARG" | |
22 | RUBY_LDFLAGS="-L$rbconfig_libdir" | |
22d315e6 JR |
23 | @@ -69,7 +69,7 @@ |
24 | ||
25 | AC_MSG_CHECKING([where to install Ruby binding]) | |
26 | AC_CACHE_VAL([cv_ruby_archdir], | |
27 | - [cv_ruby_archdir="$rbconfig_sitearchdir"]) | |
28 | + [cv_ruby_archdir="$rbconfig_vendorarchdir"]) | |
29 | AC_ARG_WITH([ruby-bindingdir], | |
30 | AS_HELP_STRING([--with-ruby-bindingdir=EXTDIR], | |
31 | [install Ruby bindings in EXTDIR | |
32 | @@ -80,13 +80,13 @@ | |
33 | ||
34 | AC_MSG_CHECKING([where to install Ruby scripts]) | |
35 | AC_CACHE_VAL([cv_ruby_sitedir], | |
36 | - [cv_ruby_sitedir="$rbconfig_sitelibdir"]) | |
37 | + [cv_ruby_sitedir="$rbconfig_vendorlibdir"]) | |
38 | AC_ARG_WITH([ruby-libdir], | |
39 | AS_HELP_STRING([--with-ruby-libdir=LIBDIR], | |
40 | [install Ruby scripts for bindings in LIBDIR | |
41 | (default is same as ruby's one)]), | |
42 | [ruby_libdir="$withval"], | |
43 | - [ruby_libdir="$cv_ruby_sitedir"]) | |
44 | + [ruby_libdir="$cv_ruby_vendordir"]) | |
45 | AC_MSG_RESULT([$ruby_libdir]) | |
46 | ||
47 | AC_SUBST(ruby_bindingdir) | |
19d2e237 JB |
48 | --- tomoe-0.6.0/bindings/ruby/tomoe-rb-char.c.orig 2007-06-06 02:44:38.000000000 +0200 |
49 | +++ tomoe-0.6.0/bindings/ruby/tomoe-rb-char.c 2012-11-12 21:20:44.718863156 +0100 | |
50 | @@ -13,7 +13,7 @@ | |
51 | if (NIL_P(xml)) { | |
52 | chr = tomoe_char_new(); | |
53 | } else { | |
54 | - chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING(xml)->len); | |
55 | + chr = tomoe_char_new_from_xml_data(RVAL2CSTR(xml), RSTRING_LEN(xml)); | |
56 | } | |
57 | ||
58 | G_INITIALIZE(self, chr); |