]>
Commit | Line | Data |
---|---|---|
ab64f8e9 JR |
1 | --- freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in~ 2009-09-14 16:43:29.000000000 +0200 |
2 | +++ freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in 2010-03-01 13:53:59.571124248 +0100 | |
692899dc MK |
3 | @@ -48,7 +48,7 @@ |
4 | RB_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('LIBRUBYARG_SHARED')"` | |
5 | AC_MSG_NOTICE([libs: $RB_LIBS]) | |
6 | ||
7 | - RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('includedir')"` | |
8 | + RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('rubyhdrdir')"` | |
9 | AC_MSG_NOTICE([include: $RB_INC_DIR]) | |
ab64f8e9 | 10 | |
692899dc MK |
11 | RB_CFLAGS=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('CFLAGS')"` |
12 | @@ -57,8 +57,11 @@ | |
13 | RB_ARCH_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts RbConfig::CONFIG.fetch('archdir')"` | |
14 | AC_MSG_NOTICE([arch: $RB_ARCH_DIR]) | |
15 | ||
16 | + RB_ARCH_INC_DIR=`${RUBYBIN} -r rbconfig -e 'puts RbConfig.expand("$(rubyhdrdir)/$(arch)")'` | |
17 | + AC_MSG_NOTICE([arch: $RB_ARCH_DIR]) | |
18 | + | |
76608aa4 | 19 | old_CFLAGS=$CFLAGS |
692899dc MK |
20 | - CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_DIR} -I${RB_INC_DIR} -I${RB_INC_DIR}/ruby-${RB_VERSION}" |
21 | + CFLAGS="$CFLAGS $RB_CFLAGS -I${RB_ARCH_INC_DIR} -I${RB_INC_DIR} -I${RB_INC_DIR}/ruby-${RB_VERSION}" | |
22 | AC_MSG_NOTICE("$CFLAGS"); | |
76608aa4 JR |
23 | FR_SMART_CHECK_INCLUDE(ruby.h) |
24 | if test "x$ac_cv_header_ruby_h" != "xyes"; then | |
d9e54585 JR |
25 | --- freeradius-server-2.1.7/src/modules/rlm_ruby/rlm_ruby.c~ 2009-09-14 16:43:29.000000000 +0200 |
26 | +++ freeradius-server-2.1.7/src/modules/rlm_ruby/rlm_ruby.c 2010-03-01 15:21:45.111123747 +0100 | |
27 | @@ -113,7 +113,7 @@ | |
28 | } | |
29 | ||
30 | /* Get the array size. */ | |
31 | - outertuplesize = RARRAY(rb_value)->len; | |
32 | + outertuplesize = RARRAY_LEN(rb_value); | |
33 | ||
34 | for (i = 0; i < outertuplesize; i++) { | |
35 | VALUE pTupleElement = rb_ary_entry(rb_value, i); | |
36 | @@ -124,7 +124,7 @@ | |
37 | /* Check if it's a pair */ | |
38 | int tuplesize; | |
39 | ||
40 | - if ((tuplesize = RARRAY(pTupleElement)->len) != 2) { | |
41 | + if ((tuplesize = RARRAY_LEN(pTupleElement)) != 2) { | |
42 | radlog(L_ERR, "%s: tuple element %d is a tuple " | |
43 | " of size %d. must be 2\n", function_name, | |
44 | i, tuplesize); |