diff options
| author | Slávek Banko <[email protected]> | 2022-03-23 18:13:35 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2022-03-23 18:13:35 +0100 |
| commit | 5daf2fbc51682f117572fe1f6a78522177dedef5 (patch) | |
| tree | 92bfa0fb72fc49a9530186ab30f25099cf379668 /lib/kross/configure.in.in | |
| parent | 920d54124a7ed87e205b280038934d9c3a55cee1 (diff) | |
| download | koffice-5daf2fbc51682f117572fe1f6a78522177dedef5.tar.gz koffice-5daf2fbc51682f117572fe1f6a78522177dedef5.zip | |
Fix FTBFS because of conflict between config.h generated by automake
and Ruby headers.
Instead of using config.h in Ruby related code, the definitions
related to Ruby version are added to CFLAGS.
Signed-off-by: Slávek Banko <[email protected]>
Diffstat (limited to 'lib/kross/configure.in.in')
| -rw-r--r-- | lib/kross/configure.in.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/kross/configure.in.in b/lib/kross/configure.in.in index c9acf48b..67e9aaf5 100644 --- a/lib/kross/configure.in.in +++ b/lib/kross/configure.in.in @@ -40,11 +40,14 @@ if test "x$compile_kross" = "xyes" ; then fi RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR" + RUBY_VERSION_DEFS="" if test "$RUBY_SERIES" -ge "19"; then AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) + RUBY_VERSION_DEFS="${RUBY_VERSION_DEFS} -DHAVE_RUBY_1_9" fi if test "$RUBY_SERIES" -ge "30"; then AC_DEFINE_UNQUOTED(HAVE_RUBY_3, 1, [Defines if your system has Ruby 3.x]) + RUBY_VERSION_DEFS="${RUBY_VERSION_DEFS} -DHAVE_RUBY_3" fi if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then @@ -85,6 +88,7 @@ if test "x$compile_kross" = "xyes" ; then AC_SUBST(RUBY_LIBRUBYARG) AC_SUBST(RUBY_CFLAGS) AC_SUBST(RUBY_ENABLESHARED) + AC_SUBST(RUBY_VERSION_DEFS) AC_MSG_CHECKING(Ruby shared library) |