summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-11-06 02:23:29 -0600
committerTimothy Pearson <[email protected]>2011-11-06 02:23:29 -0600
commitc3013f86191b4d6e398f6c96608ca652e1620726 (patch)
tree57bb2ee076eee26014aec564d92525a19cfec5b4
parentdabf065cecd0dcf132314c1e720feb6a9d97b2bb (diff)
downloadtde-style-lipstik-c3013f86191b4d6e398f6c96608ca652e1620726.tar.gz
tde-style-lipstik-c3013f86191b4d6e398f6c96608ca652e1620726.zip
Additional kde to tde renaming
-rw-r--r--acinclude.m424
-rw-r--r--config.log2
-rw-r--r--style/Makefile.am2
3 files changed, 14 insertions, 14 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index a62950c..ce50160 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -356,7 +356,7 @@ AC_DEFUN(KDE_1_CHECK_PATHS,
fi
AC_MSG_CHECKING([for KDE libraries installed])
-ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
+ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes)
@@ -548,7 +548,7 @@ AC_DEFUN(KDE_SUBST_PROGRAMS,
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs])
KDE_FIND_PATH(brockenboring, BROCKENBORING, [$kde_default_bindirs])
if test -n "$BROCKENBORING"; then
- KDE_FIND_PATH(kdeinit_wrapper, BROCKENBORING, [$kde_default_bindirs])
+ KDE_FIND_PATH(tdeinit_wrapper, BROCKENBORING, [$kde_default_bindirs])
fi
KDE_FIND_PATH(meinproc, MEINPROC, [$kde_default_bindirs])
@@ -659,7 +659,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir)
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then
@@ -1956,8 +1956,8 @@ AC_DEFUN(KDE_CREATE_LIBS_ALIASES,
AC_REQUIRE([K_PATH_X])
if test $kde_qtver = 3; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab")
@@ -1965,13 +1965,13 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
# these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
- AC_SUBST(LIB_KDECORE, "-lkdecore")
- AC_SUBST(LIB_KDEUI, "-lkdeui")
+ AC_SUBST(LIB_KDECORE, "-ltdecore")
+ AC_SUBST(LIB_KDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -1980,10 +1980,10 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
+ AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
+ AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2327,7 +2327,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else
- AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
+ AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi
])
diff --git a/config.log b/config.log
index 37bc4e9..1dd9530 100644
--- a/config.log
+++ b/config.log
@@ -278,7 +278,7 @@ kde_styledir=''
kde_templatesdir=''
kde_wallpaperdir=''
kde_widgetdir=''
-kdeinitdir=''
+tdeinitdir=''
libdir='${exec_prefix}/lib'
libexecdir='${exec_prefix}/libexec'
localstatedir='${prefix}/var'
diff --git a/style/Makefile.am b/style/Makefile.am
index 34ff9b7..12ac16b 100644
--- a/style/Makefile.am
+++ b/style/Makefile.am
@@ -19,7 +19,7 @@ noinst_HEADERS = lipstik.h misc.h
kde_style_LTLIBRARIES = lipstik.la
lipstik_la_SOURCES = lipstik.cpp misc.cpp
lipstik_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) -module
-lipstik_la_LIBADD = -lkdefx
+lipstik_la_LIBADD = -ltdefx
lipstik_la_METASOURCES = AUTO
DISTCLEANFILES = $(lipstik_la_METASOURCES)