summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-12-23 13:08:37 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-12-23 13:08:37 +0100
commit2f4e31b89abc7d7173ac840092058ef3d47f1c1f (patch)
tree06c3f87a4e2760af31aa6806efc2dd8c75783a54
parent02977208626ba8be4d8a16dccea1b1bca42cc60a (diff)
downloadkaffeine-2f4e31b89abc7d7173ac840092058ef3d47f1c1f.tar.gz
kaffeine-2f4e31b89abc7d7173ac840092058ef3d47f1c1f.zip
Rename kdewidgets => tdewidgets
-rw-r--r--acinclude.m48
-rw-r--r--aclocal.m48
m---------admin0
m---------cmake0
-rw-r--r--kaffeine/src/player-parts/dummy-part/Makefile2
5 files changed, 9 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 1aa2fae..8823c1f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -606,8 +606,8 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$trinity3ornewer"; then
- KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
- AC_SUBST(MAKEKDEWIDGETS)
+ KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
+ AC_SUBST(MAKETDEWIDGETS)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -1813,7 +1813,7 @@ ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO
dnl this might be somewhere else
-AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([
@@ -1821,7 +1821,7 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!])
fi
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/tdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by tdelibs])
diff --git a/aclocal.m4 b/aclocal.m4
index 2fd0184..3bdb147 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -618,8 +618,8 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi
if test -n "$trinity3ornewer"; then
- KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
- AC_SUBST(MAKEKDEWIDGETS)
+ KDE_FIND_PATH(maketdewidgets, MAKETDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
+ AC_SUBST(MAKETDEWIDGETS)
fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
@@ -1825,7 +1825,7 @@ ac_kde_libraries="$kde_libdir"
kde_widgetdir=NO
dnl this might be somewhere else
-AC_FIND_FILE("trinity/plugins/designer/kdewidgets.la", $kde_libdirs, kde_widgetdir)
+AC_FIND_FILE("trinity/plugins/designer/tdewidgets.la", $kde_libdirs, kde_widgetdir)
if test -n "$ac_kde_libraries" && test ! -r "$ac_kde_libraries/$kde_check_lib"; then
AC_MSG_ERROR([
@@ -1833,7 +1833,7 @@ in the prefix, you've chosen, are no KDE libraries installed. This will fail.
So, check this please and use another prefix!])
fi
-if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/kdewidgets.la"; then
+if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/trinity/plugins/designer/tdewidgets.la"; then
AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed
by tdelibs])
diff --git a/admin b/admin
-Subproject 9f768663f33e818a14dff26b403bae12a447a9e
+Subproject bae6da3fa84fa5d9cce73cf89968d61f1766e91
diff --git a/cmake b/cmake
-Subproject b51b691c8b18f5e7cf01689752c9b03a4212bdf
+Subproject d29f6d6b10fe1748c2a5fb1f9f2cdcecc473d35
diff --git a/kaffeine/src/player-parts/dummy-part/Makefile b/kaffeine/src/player-parts/dummy-part/Makefile
index 1186a8f..af9cd71 100644
--- a/kaffeine/src/player-parts/dummy-part/Makefile
+++ b/kaffeine/src/player-parts/dummy-part/Makefile
@@ -174,7 +174,7 @@ LIB_XTEST = -lXtst
LN_S = ln -s
LTLIBOBJS =
MAKEINFO = ${SHELL} /partage/Linux/site/tmp/kaffeine-0.8.8/admin/missing --run makeinfo
-MAKEKDEWIDGETS = /usr/bin/maketdewidgets
+MAKETDEWIDGETS = /usr/bin/maketdewidgets
MCOPIDL =
MEINPROC = ${prefix}/bin/meinproc
MOC = /usr/share/qt3/bin/moc