summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-10-01 23:09:08 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-10-01 23:09:08 +0900
commitc9f587dbd05a31aa98fdd4bcd2eb601202fbb442 (patch)
tree705306463f9ef9ce24a13e7e48e25d1edb93488a
parentb115ab4c4f934d8d6007fccad8326cdee5d67884 (diff)
downloadtdebindings-c9f587dbd05a31aa98fdd4bcd2eb601202fbb442.tar.gz
tdebindings-c9f587dbd05a31aa98fdd4bcd2eb601202fbb442.zip
Fixed FTBFS and detection of tdenewstuff.
-rw-r--r--configure.in.in6
-rw-r--r--kalyptus/kalyptusCxxToSmoke.pm2
-rw-r--r--korundum/bin/Makefile.am2
-rw-r--r--qtruby/ChangeLog2
-rw-r--r--smoke/tde/Makefile.am2
-rw-r--r--smoke/tde/tde_header_list10
6 files changed, 12 insertions, 12 deletions
diff --git a/configure.in.in b/configure.in.in
index 4864ff06..97468718 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -266,7 +266,7 @@ KDE_CHECK_MDI
AC_DEFUN([KDE_CHECK_KNS],
[
- AC_MSG_CHECKING(whether to use the knewstuff lib from tdelibs)
+ AC_MSG_CHECKING(whether to use the tdenewstuff lib from tdelibs)
AC_CACHE_VAL(ac_cv_kns_setup,
[
AC_LANG_SAVE
@@ -290,7 +290,7 @@ AC_DEFUN([KDE_CHECK_KNS],
])
if test "$ac_cv_kns_setup" = "yes"; then
- LIB_KNS="-lknewstuff"
+ LIB_KNS="-ltdenewstuff"
AC_MSG_RESULT(yes)
else
LIB_KNS=''
@@ -300,7 +300,7 @@ AC_DEFUN([KDE_CHECK_KNS],
AC_SUBST(LIB_KNS)
])
-dnl Check if knewstuff is present, if not don't bother..
+dnl Check if tdenewstuff is present, if not don't bother..
KDE_CHECK_KNS
dnl remove when fixed
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index fa3722d2..a33f74a7 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -230,7 +230,7 @@ BEGIN
'TQStyle::SubControls' => 'int',
);
-$headerSubdirectories = "tdeio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|knewstuff/"
+$headerSubdirectories = "tdeio/|tdevelop/|kinterfacedesigner/|kontact/|kate/|tdeparts/|dom/|tdeabc/|ksettings/|kjs/|tdetexteditor/|tdeprint/|tdesu/|tdenewstuff/"
}
diff --git a/korundum/bin/Makefile.am b/korundum/bin/Makefile.am
index 92beb014..01d89533 100644
--- a/korundum/bin/Makefile.am
+++ b/korundum/bin/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
bin_PROGRAMS = krubyinit
-krubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tde/ -L$(RUBY_LIBDIR) -ltdemdi -lknewstuff
+krubyinit_LDFLAGS = -module $(all_libraries) -version-info 0:0:0 -L$(top_srcdir)/smoke/tde/ -L$(RUBY_LIBDIR) -ltdemdi -ltdenewstuff
krubyinit_METASOURCES = AUTO
krubyinit_SOURCES = krubyinit.cpp
krubyinit_LDADD = $(LIB_KDE) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la
diff --git a/qtruby/ChangeLog b/qtruby/ChangeLog
index 3c3f94bc..cd9455da 100644
--- a/qtruby/ChangeLog
+++ b/qtruby/ChangeLog
@@ -485,7 +485,7 @@
2005-02-07 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Added a KNS:: namespace for the KNewStuff library
+ * Added a KNS:: namespace for the TDENewStuff library
2005-02-06 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
diff --git a/smoke/tde/Makefile.am b/smoke/tde/Makefile.am
index 69e97775..36670c88 100644
--- a/smoke/tde/Makefile.am
+++ b/smoke/tde/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST=generate.pl.in qtguess.pl.in qt_smoke.h Makefile.am
libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
# the libraries to link against.
-libsmoketde_la_LIBADD = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_TDESPELL) $(LIB_TDEUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -ltdefx -lknewstuff -ltdemdi
+libsmoketde_la_LIBADD = $(LIB_TDEHTML) -lkjs -lfontconfig $(LIB_KMDI) $(LIB_KNS) $(LIB_TDESPELL) $(LIB_TDEUTILS) $(LIB_TDEPRINT) $(GLLIB) $(LIB_QT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -ltdefx -ltdenewstuff -ltdemdi
x_sources = x_1.cpp x_2.cpp x_3.cpp x_4.cpp x_5.cpp x_6.cpp x_7.cpp \
x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \
diff --git a/smoke/tde/tde_header_list b/smoke/tde/tde_header_list
index f6491c4f..c72c2081 100644
--- a/smoke/tde/tde_header_list
+++ b/smoke/tde/tde_header_list
@@ -432,9 +432,9 @@ tdeio/uiserver.h
tdeio/uiserver_stub.h
netwm_def.h
netwm.h
-knewstuff/knewstuff.h
-knewstuff/knewstuffsecure.h
-knewstuff/engine.h
-knewstuff/entry.h
-knewstuff/provider.h
+tdenewstuff/knewstuff.h
+tdenewstuff/knewstuffsecure.h
+tdenewstuff/engine.h
+tdenewstuff/entry.h
+tdenewstuff/provider.h