|
Lines 1-6
Link Here
|
| 1 |
--- configure.orig 2008-10-08 01:54:55.000000000 +0200 |
1 |
--- configure.orig 2010-01-26 16:01:10.000000000 +0000 |
| 2 |
+++ configure 2009-02-27 11:12:03.000000000 +0100 |
2 |
+++ configure 2011-02-28 06:36:25.156165774 +0000 |
| 3 |
@@ -6481,6 +6481,9 @@ |
3 |
@@ -6917,6 +6917,9 @@ |
| 4 |
*-apple-darwin* ) |
4 |
*-apple-darwin* ) |
| 5 |
CFLAGS="${CFLAGS} -fno-common -Wall" |
5 |
CFLAGS="${CFLAGS} -fno-common -Wall" |
| 6 |
;; |
6 |
;; |
|
Lines 10-16
Link Here
|
| 10 |
*-freebsd* ) |
10 |
*-freebsd* ) |
| 11 |
CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math" |
11 |
CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math" |
| 12 |
;; |
12 |
;; |
| 13 |
@@ -26247,7 +26250,9 @@ |
13 |
@@ -24803,7 +24806,9 @@ |
| 14 |
|
14 |
|
| 15 |
LUA_INCLUDES="" |
15 |
LUA_INCLUDES="" |
| 16 |
LUA_LIBS="" |
16 |
LUA_LIBS="" |
|
Lines 21-23
Link Here
|
| 21 |
|
21 |
|
| 22 |
if test -n "$lua_inc"; then |
22 |
if test -n "$lua_inc"; then |
| 23 |
CFLAGS="$CFLAGS -I$lua_inc" |
23 |
CFLAGS="$CFLAGS -I$lua_inc" |
|
|
24 |
@@ -27574,7 +27579,14 @@ |
| 25 |
if test "x$RUBY" = "x"; then |
| 26 |
use_ruby="No (ruby not available)" |
| 27 |
else |
| 28 |
- RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`" |
| 29 |
+ RUBY_VER="`$RUBY -rrbconfig -e \"puts Config::CONFIG['ruby_version']\"`" |
| 30 |
+ if test "x$RUBY_VER" = "x1.8"; then |
| 31 |
+ RUBY_INCLUDES="-I`$RUBY $srcdir/config/config_ruby.rb INCLUDES`" |
| 32 |
+ else |
| 33 |
+ RUBY_INC="`$RUBY -rrbconfig -e \"puts Config::CONFIG['rubyhdrdir']\"`" |
| 34 |
+ RUBY_ARCH="`$RUBY -rrbconfig -e \"puts Config::CONFIG['arch']\"`" |
| 35 |
+ RUBY_INCLUDES="-I$RUBY_INC -I$RUBY_INC/$RUBY_ARCH" |
| 36 |
+ fi |
| 37 |
# hack for powerpc-darwin8 (10.4) |
| 38 |
RUBY_INCLUDES=`echo $RUBY_INCLUDES | sed 's/powerpc/universal/'` |
| 39 |
RUBY_LIBS="-L`$RUBY $srcdir/config/config_ruby.rb lib` `$RUBY -rrbconfig -e \"puts Config::CONFIG['LIBRUBYARG_SHARED']\"`" |