projects / packages / geos.git / blame
| Commit | Line | Data |
|---|---|---|
| a36f77b6 JR |
1 | --- geos-3.2.0/macros/ruby.m4~ 2007-09-07 01:22:38.000000000 +0200 |
| 2 | +++ geos-3.2.0/macros/ruby.m4 2010-03-02 14:29:47.012190992 +0100 | |
| 3 | @@ -25,8 +25,9 @@ | |
| 4 | dnl Get Ruby bin directory | |
| 5 | RUBY_BIN_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["bindir"]]'` | |
| 6 | ||
| 7 | - dnl Get Ruby include directory | |
| 8 | - RUBY_INCLUDE_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["archdir"]]'` | |
| 9 | + dnl Get Ruby include directories | |
| 10 | + RUBY_INCLUDE_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["rubyhdrdir"]]'` | |
| 11 | + RUBY_ARCHINCLUDE_DIR=`$RUBY -rrbconfig -e 'puts RbConfig.expand("$(rubyhdrdir)/$(arch)")'` | |
| 12 | ||
| 13 | dnl Get Ruby lib directory | |
| 14 | RUBY_LIB_DIR=`$RUBY -rrbconfig -e 'puts Config::CONFIG[["libdir"]]'` | |
| 15 | @@ -44,6 +45,7 @@ | |
| 16 | AC_MSG_NOTICE([Ruby version is '$RUBY_VERSION']) | |
| 17 | AC_MSG_NOTICE([Ruby bin directory is '$RUBY_BIN_DIR']) | |
| 18 | AC_MSG_NOTICE([Ruby include directory is '$RUBY_INCLUDE_DIR']) | |
| 19 | + AC_MSG_NOTICE([Ruby arch include directory is '$RUBY_ARCHINCLUDE_DIR']) | |
| 20 | AC_MSG_NOTICE([Ruby library directory is '$RUBY_LIB_DIR']) | |
| 21 | AC_MSG_NOTICE([Ruby extension directory is '$RUBY_EXTENSION_DIR']) | |
| 22 | AC_MSG_NOTICE([Ruby library is '$RUBY_SO_NAME']) | |
| 23 | @@ -52,6 +54,7 @@ | |
| 24 | AC_SUBST([RUBY_VERSION]) | |
| 25 | AC_SUBST([RUBY_BIN_DIR]) | |
| 26 | AC_SUBST([RUBY_INCLUDE_DIR]) | |
| 27 | + AC_SUBST([RUBY_ARCHINCLUDE_DIR]) | |
| 28 | AC_SUBST([RUBY_LIB_DIR]) | |
| 29 | AC_SUBST([RUBY_EXTENSION_DIR]) | |
| 30 | AC_SUBST([RUBY_SO_NAME]) | |
| 31 | --- geos-3.2.0/swig/ruby/Makefile.am~ 2007-08-31 22:18:15.000000000 +0200 | |
| 32 | +++ geos-3.2.0/swig/ruby/Makefile.am 2010-03-02 14:30:59.197124565 +0100 | |
| 33 | @@ -14,7 +14,7 @@ | |
| 34 | rubyextensiondirdir = $(RUBY_EXTENSION_DIR) | |
| 35 | ||
| 36 | # Setup includes | |
| 37 | -INCLUDES = -I$(RUBY_INCLUDE_DIR) | |
| 38 | +INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_ARCHINCLUDE_DIR) | |
| 39 | ||
| 40 | # Build Ruby module as shared library | |
| 41 | rubyextensiondir_LTLIBRARIES = geos.la | |
| 42 | --- geos-3.2.0/swig/ruby/ruby.i~ 2009-07-15 20:56:30.000000000 +0200 | |
| 43 | +++ geos-3.2.0/swig/ruby/ruby.i 2010-03-02 17:02:01.176123831 +0100 | |
| 44 | @@ -75,7 +75,7 @@ | |
| 45 | Check_Type($input, T_ARRAY); | |
| 46 | ||
| 47 | /* Get the length */ | |
| 48 | - $2 = RARRAY($input)->len; | |
| 49 | + $2 = RARRAY_LEN($input); | |
| 50 | ||
| 51 | /* Allocate space for the C array. */ | |
| 52 | $1 = (GeosLinearRing**) malloc($2*sizeof(GeosLinearRing*)); |