diff options
| -rw-r--r-- | acinclude.m4 | 22 | ||||
| -rw-r--r-- | config.log | 6 | ||||
| -rw-r--r-- | style/config/Makefile.am | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index ce50160..7b9d185 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-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, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-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, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_SMB, "-lsmb") @@ -1980,13 +1980,13 @@ 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, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - 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)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) @@ -168,9 +168,9 @@ LIBUTIL='' LIBZ='' LIB_KAB='' LIB_KABC='' -LIB_KDECORE='' -LIB_KDEPRINT='' -LIB_KDEUI='' +LIB_TDECORE='' +LIB_TDEPRINT='' +LIB_TDEUI='' LIB_KFILE='' LIB_KFM='' LIB_KHTML='' diff --git a/style/config/Makefile.am b/style/config/Makefile.am index 3585d4a..de50a34 100644 --- a/style/config/Makefile.am +++ b/style/config/Makefile.am @@ -2,8 +2,8 @@ INCLUDES = $(all_includes) noinst_HEADERS = lipstikconf.h kde_module_LTLIBRARIES = kstyle_lipstik_config.la -kstyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_KDECORE) $(KDE_PLUGIN) -module -kstyle_lipstik_config_la_LIBADD = $(LIB_KDEUI) +kstyle_lipstik_config_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(KDE_PLUGIN) -module +kstyle_lipstik_config_la_LIBADD = $(LIB_TDEUI) kstyle_lipstik_config_la_SOURCES = lipstikconf.cpp kstyle_lipstik_config_la_METASOURCES = AUTO |