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 <slavek.banko@axis.cz>
(cherry picked from commit 5daf2fbc51)
r14.0.x
Slávek Banko 3 years ago
parent 37fb4f1823
commit b8c35f29db
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -40,11 +40,14 @@ if test "x$compile_kross" = "xyes" ; then
fi fi
RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR" RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
RUBY_VERSION_DEFS=""
if test "$RUBY_SERIES" -ge "19"; then if test "$RUBY_SERIES" -ge "19"; then
AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x]) 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 fi
if test "$RUBY_SERIES" -ge "30"; then if test "$RUBY_SERIES" -ge "30"; then
AC_DEFINE_UNQUOTED(HAVE_RUBY_3, 1, [Defines if your system has Ruby 3.x]) 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 fi
if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then 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_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS) AC_SUBST(RUBY_CFLAGS)
AC_SUBST(RUBY_ENABLESHARED) AC_SUBST(RUBY_ENABLESHARED)
AC_SUBST(RUBY_VERSION_DEFS)
AC_MSG_CHECKING(Ruby shared library) AC_MSG_CHECKING(Ruby shared library)

@ -2,7 +2,7 @@ include $(top_srcdir)/lib/kross/Makefile.global
CXXFLAGS += $(USE_EXCEPTIONS) CXXFLAGS += $(USE_EXCEPTIONS)
INCLUDES = -I$(top_srcdir)/lib/kross -I$(RUBY_INCLUDEDIR) $(RUBY_CFLAGS) $(all_includes) INCLUDES = -I$(top_srcdir)/lib/kross -I$(RUBY_INCLUDEDIR) $(RUBY_CFLAGS) $(RUBY_VERSION_DEFS) $(all_includes)
METASOURCES = AUTO METASOURCES = AUTO
kde_module_LTLIBRARIES = krossruby.la kde_module_LTLIBRARIES = krossruby.la

@ -17,7 +17,6 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
***************************************************************************/ ***************************************************************************/
#include "config.h"
#include "rubyinterpreter.h" #include "rubyinterpreter.h"
#include <map> #include <map>

@ -17,7 +17,6 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
***************************************************************************/ ***************************************************************************/
#include "config.h"
#include "ruby.h" #include "ruby.h"
void kross_rb_set_safe_level(int safelevel) { void kross_rb_set_safe_level(int safelevel) {

Loading…
Cancel
Save