Fixed FTBFS and detection of tdenewstuff.

pull/1/head
Michele Calgaro 10 years ago
parent b115ab4c4f
commit c9f587dbd0

@ -266,7 +266,7 @@ KDE_CHECK_MDI
AC_DEFUN([KDE_CHECK_KNS], 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_CACHE_VAL(ac_cv_kns_setup,
[ [
AC_LANG_SAVE AC_LANG_SAVE
@ -290,7 +290,7 @@ AC_DEFUN([KDE_CHECK_KNS],
]) ])
if test "$ac_cv_kns_setup" = "yes"; then if test "$ac_cv_kns_setup" = "yes"; then
LIB_KNS="-lknewstuff" LIB_KNS="-ltdenewstuff"
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
LIB_KNS='' LIB_KNS=''
@ -300,7 +300,7 @@ AC_DEFUN([KDE_CHECK_KNS],
AC_SUBST(LIB_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 KDE_CHECK_KNS
dnl remove when fixed dnl remove when fixed

@ -230,7 +230,7 @@ BEGIN
'TQStyle::SubControls' => 'int', '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/"
} }

@ -1,7 +1,7 @@
INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS) INCLUDES = $(all_includes) -I$(RUBY_ARCHDIR) $(RUBY_CFLAGS)
bin_PROGRAMS = krubyinit 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_METASOURCES = AUTO
krubyinit_SOURCES = krubyinit.cpp krubyinit_SOURCES = krubyinit.cpp
krubyinit_LDADD = $(LIB_KDE) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la krubyinit_LDADD = $(LIB_KDE) $(RUBY_LIBRUBYARG) $(top_builddir)/smoke/tde/libsmoketde.la $(top_builddir)/qtruby/rubylib/qtruby/libqtrubyinternal.la

@ -485,7 +485,7 @@
2005-02-07 Richard Dale <Richard_Dale@tipitina.demon.co.uk> 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> 2005-02-06 Richard Dale <Richard_Dale@tipitina.demon.co.uk>

@ -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) libsmoketde_la_LDFLAGS = -version-info 3:2:2 -no-undefined $(all_libraries) $(GLINC) $(KDE_RPATH)
# the libraries to link against. # 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_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 \ x_8.cpp x_9.cpp x_10.cpp x_11.cpp x_12.cpp x_13.cpp x_14.cpp x_15.cpp \

@ -432,9 +432,9 @@ tdeio/uiserver.h
tdeio/uiserver_stub.h tdeio/uiserver_stub.h
netwm_def.h netwm_def.h
netwm.h netwm.h
knewstuff/knewstuff.h tdenewstuff/knewstuff.h
knewstuff/knewstuffsecure.h tdenewstuff/knewstuffsecure.h
knewstuff/engine.h tdenewstuff/engine.h
knewstuff/entry.h tdenewstuff/entry.h
knewstuff/provider.h tdenewstuff/provider.h

Loading…
Cancel
Save