diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-05-07 11:48:16 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-05-07 11:48:16 -0500 |
| commit | 8f79beaace9e28aa1bb8de78cdd01b7a756916f5 (patch) | |
| tree | 300b3d36ccb00b44e98470b1376af6670d36f3b7 /configure.in | |
| parent | e061a3e9eebedbc53f21c60f5509573ce0e50816 (diff) | |
| download | amarok-8f79beaace9e28aa1bb8de78cdd01b7a756916f5.tar.gz amarok-8f79beaace9e28aa1bb8de78cdd01b7a756916f5.zip | |
Fix build support for both ruby 1.8.x and 1.9.x.
Thanks to Francois Andriot.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.in b/configure.in index e2727692..9e2f54f4 100644 --- a/configure.in +++ b/configure.in @@ -1162,7 +1162,14 @@ AC_CHECK_TYPES([uint8_t, u_int8_t, uint16_t, u_int16_t, uint32_t, u_int32_t, uin AC_PATH_PROG(RUBY, ruby, no) -ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`] +if test -n "$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'"; then + # Ruby 1.9 + ruby_includes=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"rubyhdrdir"@:>@)'` +else + # not Ruby 1.9 + ruby_includes=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["archdir"] )'`] +fi + ruby_ldflags=[`$RUBY -rrbconfig -e 'puts Config.expand( Config::MAKEFILE_CONFIG["LIBRUBYARG_SHARED"] )'`] AC_SUBST(ruby_includes) |
