summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
m---------cmake0
-rw-r--r--dcopjava/binding/Makefile.am4
-rw-r--r--korundum/bin/Makefile.am2
-rw-r--r--korundum/configure.in.in (renamed from korundum/rubylib/korundum/configure.in.in)35
-rw-r--r--korundum/rubylib/korundum/Makefile.am2
-rw-r--r--qtruby/bin/Makefile.am2
-rw-r--r--qtruby/configure.in.in (renamed from qtruby/rubylib/qtruby/configure.in.in)35
-rw-r--r--qtruby/rubylib/designer/rbuic/form.cpp2
-rw-r--r--qtruby/rubylib/designer/uilib/Makefile.am2
-rw-r--r--qtruby/rubylib/qtruby/Makefile.am2
11 files changed, 79 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules
index bdec8fca..934def7f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "admin"]
path = admin
url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin
-[submodule "cmake"]
- path = cmake
- url = https://system@scm.trinitydesktop.org/scm/git/tde-common-cmake
diff --git a/cmake b/cmake
deleted file mode 160000
-Subproject bfa3a90b73588be47dc3f4d373ff63ce17dfb6a
diff --git a/dcopjava/binding/Makefile.am b/dcopjava/binding/Makefile.am
index be90dd10..2fe8e5d5 100644
--- a/dcopjava/binding/Makefile.am
+++ b/dcopjava/binding/Makefile.am
@@ -1,8 +1,8 @@
lib_LTLIBRARIES = libjavadcop.la
libjavadcop_la_SOURCES = client.cpp
-libjavadcop_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
-libjavadcop_la_LIBADD = $(LIB_TDECORE)
+libjavadcop_la_LDFLAGS = $(all_libraries) $(KDE_LDFLAGS) $(KDE_PLUGIN)
+libjavadcop_la_LIBADD = $(LIB_TDECORE) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx
INCLUDES = $(jni_includes) $(all_includes)
diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am
index 01d89533..72212f5b 100644
--- a/korundum/bin/Makefile.am
+++ b/korundum/bin/Makefile.am
@@ -1,3 +1,5 @@
+CXXFLAGS += $(RUBY_CXXFLAGS)
+
INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
bin_PROGRAMS = krubyinit
diff --git a/korundum/rubylib/korundum/configure.in.in b/korundum/configure.in.in
index 0a987639..c420adc9 100644
--- a/korundum/rubylib/korundum/configure.in.in
+++ b/korundum/configure.in.in
@@ -32,6 +32,37 @@ else
RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
fi
+ # check if Ruby requires explicit specification of C++ standard
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ SAVED_CXXFLAGS="$CXXFLAGS"
+ for CXX_STD_TEST in "" 11 14 17; do
+ CXXFLAGS="$SAVED_CXXFLAGS"
+ if test "x$CXX_STD_TEST" = "x"; then
+ AC_MSG_CHECKING([Ruby build with default C++ standard])
+ RUBY_CXXFLAGS=""
+ else
+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
+ fi
+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
+ AC_TRY_COMPILE([
+ #include <ruby.h>
+ ],[ ],
+ ruby_cxx_std=yes,
+ ruby_cxx_std=no
+ )
+ if test "x$ruby_cxx_std" = "xyes"; then
+ AC_SUBST(RUBY_CXXFLAGS)
+ AC_MSG_RESULT(yes)
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
+ done
+ CXXFLAGS="$SAVED_CXXFLAGS"
+ AC_LANG_RESTORE
+
# Removes trailing slashes, if any, to avoid fail to install with recent libtool.
RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
RUBY_SITEDIR=${RUBY_SITEDIR%/}
@@ -46,7 +77,8 @@ else
libdir $RUBY_LIBDIR,
includedir $RUBY_INCLUDEDIR,
librubyarg $RUBY_LIBRUBYARG,
- cflags $RUBY_CFLAGS])
+ cflags $RUBY_CFLAGS,
+ cxxflags $RUBY_CXXFLAGS])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)
AC_SUBST(RUBY_SITEDIR)
@@ -56,4 +88,3 @@ else
AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS)
fi
-
diff --git a/korundum/rubylib/korundum/Makefile.am b/korundum/rubylib/korundum/Makefile.am
index 453718b4..568479a5 100644
--- a/korundum/rubylib/korundum/Makefile.am
+++ b/korundum/rubylib/korundum/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/bin/Makefile.am b/qtruby/bin/Makefile.am
index ac39aeb2..46159ec4 100644
--- a/qtruby/bin/Makefile.am
+++ b/qtruby/bin/Makefile.am
@@ -1,3 +1,5 @@
+CXXFLAGS += $(RUBY_CXXFLAGS)
+
INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
bin_PROGRAMS = qtrubyinit
diff --git a/qtruby/rubylib/qtruby/configure.in.in b/qtruby/configure.in.in
index db0594a3..84ad88ec 100644
--- a/qtruby/rubylib/qtruby/configure.in.in
+++ b/qtruby/configure.in.in
@@ -32,6 +32,37 @@ else
RUBY_CFLAGS="-I${RUBY_INCLUDEDIR}"
fi
+ # check if Ruby requires explicit specification of C++ standard
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ SAVED_CXXFLAGS="$CXXFLAGS"
+ for CXX_STD_TEST in "" 11 14 17; do
+ CXXFLAGS="$SAVED_CXXFLAGS"
+ if test "x$CXX_STD_TEST" = "x"; then
+ AC_MSG_CHECKING([Ruby build with default C++ standard])
+ RUBY_CXXFLAGS=""
+ else
+ AC_MSG_CHECKING([Ruby build with C++$CXX_STD_TEST])
+ RUBY_CXXFLAGS="-std=c++$CXX_STD_TEST"
+ fi
+ CXXFLAGS="$SAVED_CXXFLAGS $RUBY_CFLAGS $RUBY_CXXFLAGS"
+ AC_TRY_COMPILE([
+ #include <ruby.h>
+ ],[ ],
+ ruby_cxx_std=yes,
+ ruby_cxx_std=no
+ )
+ if test "x$ruby_cxx_std" = "xyes"; then
+ AC_SUBST(RUBY_CXXFLAGS)
+ AC_MSG_RESULT(yes)
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
+ done
+ CXXFLAGS="$SAVED_CXXFLAGS"
+ AC_LANG_RESTORE
+
# Removes trailing slashes, if any, to avoid fail to install with recent libtool.
RUBY_ARCHDIR=${RUBY_ARCHDIR%/}
RUBY_SITEDIR=${RUBY_SITEDIR%/}
@@ -46,7 +77,8 @@ else
libdir $RUBY_LIBDIR,
includedir $RUBY_INCLUDEDIR,
librubyarg $RUBY_LIBRUBYARG,
- cflags $RUBY_CFLAGS])
+ cflags $RUBY_CFLAGS,
+ cxxflags $RUBY_CXXFLAGS])
AC_SUBST(RUBY_ARCHDIR)
AC_SUBST(RUBY_SITEARCHDIR)
AC_SUBST(RUBY_SITEDIR)
@@ -56,4 +88,3 @@ else
AC_SUBST(RUBY_LIBRUBYARG)
AC_SUBST(RUBY_CFLAGS)
fi
-
diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index 937c32eb..fa402bb5 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -241,7 +241,7 @@ void Uic::createFormImpl( const TQDomElement &e )
// children
if( !objectNames.isEmpty() )
- tqWarning("WARNING : objectNames should be empty at "__FILE__" line %d\n", __LINE__);
+ tqWarning("WARNING : objectNames should be empty at %s line %d", __FILE__, __LINE__);
nl = e.parentNode().toElement().elementsByTagName( "widget" );
for ( i = 1; i < (int) nl.length(); i++ )
{ // start at 1, 0 is the toplevel widget
diff --git a/qtruby/rubylib/designer/uilib/Makefile.am b/qtruby/rubylib/designer/uilib/Makefile.am
index b7cc229a..c499269a 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 09ac6b0a..2bd1f653 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