6 files changed, 11 insertions, 1 deletions
diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am
index fc2a27341..ab2214555 100644
--- a/lib/kotext/Makefile.am
+++ b/lib/kotext/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = kohyphen . tests
 INCLUDES= $(KOFFICECORE_INCLUDES) $(KOFFICEUI_INCLUDES) $(KSTORE_INCLUDES) $(all_includes)
 ## Needed for kohyphen...
-KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+CXXFLAGS += $(USE_EXCEPTIONS)
 
 lib_LTLIBRARIES = libkotext.la
 libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \
diff --git a/lib/kross/api/Makefile.am b/lib/kross/api/Makefile.am
index 7cc93ba82..7f1313427 100644
--- a/lib/kross/api/Makefile.am
+++ b/lib/kross/api/Makefile.am
@@ -1,6 +1,8 @@
 include $(top_srcdir)/lib/kross/Makefile.global
 apiincludedir=$(includedir)/kross/api
 
+CXXFLAGS += $(USE_EXCEPTIONS)
+
 apiinclude_HEADERS = \
     callable.h \
     class.h \
diff --git a/lib/kross/main/Makefile.am b/lib/kross/main/Makefile.am
index 2acab1001..7d779b82a 100644
--- a/lib/kross/main/Makefile.am
+++ b/lib/kross/main/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/lib/kross/Makefile.global
 
+CXXFLAGS += $(USE_EXCEPTIONS)
+
 lib_LTLIBRARIES = libkrossmain.la
 
 libkrossmain_la_SOURCES = krossconfig.cpp mainmodule.cpp scriptcontainer.cpp manager.cpp \
diff --git a/lib/kross/python/Makefile.am b/lib/kross/python/Makefile.am
index 743b3e0c5..0fc935562 100644
--- a/lib/kross/python/Makefile.am
+++ b/lib/kross/python/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/lib/kross/Makefile.global
 
+CXXFLAGS += $(USE_EXCEPTIONS)
+
 kde_module_LTLIBRARIES = krosspython.la
 
 krosspython_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIBPYTHON) $(PYTHONLIB) -module $(VER_INFO)
diff --git a/lib/kross/python/cxx/Makefile.am b/lib/kross/python/cxx/Makefile.am
index d1c72c873..4e1377c00 100644
--- a/lib/kross/python/cxx/Makefile.am
+++ b/lib/kross/python/cxx/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/lib/kross/Makefile.global
 
+CXXFLAGS += $(USE_EXCEPTIONS)
+
 noinst_LTLIBRARIES = libkrosspythoncxx.la
 
 libkrosspythoncxx_la_SOURCES = \
diff --git a/lib/kross/ruby/Makefile.am b/lib/kross/ruby/Makefile.am
index 256c662b9..fadee61ee 100644
--- a/lib/kross/ruby/Makefile.am
+++ b/lib/kross/ruby/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/lib/kross/Makefile.global
 
+CXXFLAGS += $(USE_EXCEPTIONS)
+
 INCLUDES = -I$(top_srcdir)/lib/kross -I$(RUBY_INCLUDEDIR) $(RUBY_CFLAGS) $(all_includes)
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = krossruby.la