3 files changed, 4 insertions, 59 deletions
diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
index 45876ed6..80363009 100644
--- a/qtruby/rubylib/designer/uilib/Makefile.am
+++ b/qtruby/rubylib/designer/uilib/Makefile.am
@@ -1,3 +1,5 @@
+CXXFLAGS += $(RUBY_CXXFLAGS)
+
 INCLUDES = -I$(top_srcdir)/smoke -I$(top_srcdir)/qtruby/rubylib/qtruby $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
 
 rubylibdir = $(RUBY_ARCHDIR)
diff --git a/qtruby/rubylib/qtruby/Makefile.am b/qtruby/rubylib/qtruby/Makefile.am
index 7083719c..c273c599 100644
--- a/qtruby/rubylib/qtruby/Makefile.am
+++ b/qtruby/rubylib/qtruby/Makefile.am
@@ -1,3 +1,5 @@
+CXXFLAGS += $(RUBY_CXXFLAGS)
+
 INCLUDES = -I$(top_srcdir)/smoke $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
 
 noinst_HEADERS = qtruby.h marshall.h smokeruby.h extconf.rb 
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/rubylib/qtruby/configure.in.in
deleted file mode 100644
index db0594a3..00000000
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ /dev/null
@@ -1,59 +0,0 @@
-AC_CHECK_PROG(RUBY_EXECUTABLE, ruby, ruby)
-
-if test -z "RUBY_EXECUTABLE"; then
-  DO_NOT_COMPILE="$DO_NOT_COMPILE qtruby"
-else
-  RUBY_MAJOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MAJOR))"`
-  RUBY_MINOR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(MINOR))"`
-
-  RUBY_ARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-  RUBY_SITEARCHDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitearchdir))"`
-  RUBY_SITEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(sitelibdir))"`
-  RUBY_LIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(libdir))"`
-  RUBY_RUBYLIBDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubylibdir))"`
-  RUBY_LIBRUBYARG=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(LIBRUBYARG_SHARED))"`
-
-  RUBY_SERIES="$RUBY_MAJOR$RUBY_MINOR"
-  if test "$RUBY_SERIES" -ge "19"; then
-     AC_DEFINE_UNQUOTED(HAVE_RUBY_1_9, 1, [Defines if your system has Ruby 1.9.x])
-  fi
-
-  if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyhdrdir))"` = "true"; then
-     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyhdrdir))"`
-     if test `${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.key?(%q(rubyarchhdrdir))"` = "true"; then
-        RUBY_ARCHINCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(rubyarchhdrdir))"`
-     else
-        RUBY_ARCH=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(arch))"`
-        RUBY_ARCHINCLUDEDIR=${RUBY_INCLUDEDIR}/${RUBY_ARCH}
-     fi
-     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR} -I${RUBY_ARCHINCLUDEDIR}"
-  else
-     RUBY_INCLUDEDIR=`${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG.fetch(%q(archdir))"`
-     RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
-  fi
-
-  # Removes trailing slashes, if any, to avoid fail to install with recent libtool.
-  RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
-  RUBY_SITEDIR=${RUBY_SITEDIR%/}
-  RUBY_LIBDIR=${RUBY_LIBDIR%/}
-  RUBY_RUBYLIBDIR=${RUBY_RUBYLIBDIR%/}
-
-  AC_MSG_RESULT([\
-                  archdir $RUBY_ARCHDIR,
-                  sitearchdir $RUBY_SITEARCHDIR,
-                  sitedir $RUBY_SITEDIR,
-                  rubylibdir $RUBY_RUBYLIBDIR,
-                  libdir $RUBY_LIBDIR,
-                  includedir $RUBY_INCLUDEDIR,
-                  librubyarg $RUBY_LIBRUBYARG,
-                  cflags $RUBY_CFLAGS])
-  AC_SUBST(RUBY_ARCHDIR)
-  AC_SUBST(RUBY_SITEARCHDIR)
-  AC_SUBST(RUBY_SITEDIR)
-  AC_SUBST(RUBY_RUBYLIBDIR)
-  AC_SUBST(RUBY_LIBDIR)
-  AC_SUBST(RUBY_INCLUDEDIR)
-  AC_SUBST(RUBY_LIBRUBYARG)
-  AC_SUBST(RUBY_CFLAGS)
-fi
-