Browse Source

Additional kde to tde renaming

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
5e528effc2
2 changed files with 14 additions and 14 deletions
  1. 13
    13
      acinclude.m4
  2. 1
    1
      krename/Makefile.am

+ 13
- 13
acinclude.m4 View File

@@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
371 371
   fi
372 372
 
373 373
 AC_MSG_CHECKING([for KDE libraries installed])
374
-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'
374
+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'
375 375
 
376 376
 if AC_TRY_EVAL(ac_link) && test -s conftest; then
377 377
   AC_MSG_RESULT(yes)
@@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
710 710
 AC_SUBST(kde_servicesdir)
711 711
 AC_SUBST(kde_servicetypesdir)
712 712
 AC_SUBST(kde_moduledir)
713
-AC_SUBST(kdeinitdir, '$(kde_moduledir)')
713
+AC_SUBST(tdeinitdir, '$(kde_moduledir)')
714 714
 AC_SUBST(kde_styledir)
715 715
 AC_SUBST(kde_widgetdir)
716 716
 if test "$kde_qtver" = 1; then
@@ -2064,12 +2064,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
2064 2064
 
2065 2065
 if test $kde_qtver = 3; then
2066 2066
    case $host in 
2067
-               *cygwin*) lib_kded="-lkdeinit_kded" ;;
2067
+               *cygwin*) lib_kded="-ltdeinit_kded" ;;
2068 2068
                *) lib_kded="" ;;
2069 2069
        esac
2070 2070
    AC_SUBST(LIB_KDED, $lib_kded)
2071
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2072
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2071
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
2072
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
2073 2073
    AC_SUBST(LIB_KIO, "-lkio")
2074 2074
    AC_SUBST(LIB_KJS, "-lkjs")
2075 2075
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then
2078 2078
    AC_SUBST(LIB_KHTML, "-lkhtml")
2079 2079
    AC_SUBST(LIB_KSPELL, "-lkspell")
2080 2080
    AC_SUBST(LIB_KPARTS, "-lkparts")
2081
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2081
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
2082 2082
    AC_SUBST(LIB_KUTILS, "-lkutils")
2083
-   AC_SUBST(LIB_KDEPIM, "-lkdepim")
2083
+   AC_SUBST(LIB_KDEPIM, "-ltdepim")
2084 2084
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086 2086
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then
2089 2089
    AC_SUBST(LIB_KSYCOCA, "-lkio")
2090 2090
    AC_SUBST(LIB_KFILE, "-lkio")
2091 2091
 elif test $kde_qtver = 2; then
2092
-   AC_SUBST(LIB_KDECORE, "-lkdecore")
2093
-   AC_SUBST(LIB_KDEUI, "-lkdeui")
2092
+   AC_SUBST(LIB_KDECORE, "-ltdecore")
2093
+   AC_SUBST(LIB_KDEUI, "-ltdeui")
2094 2094
    AC_SUBST(LIB_KIO, "-lkio")
2095 2095
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2099,10 +2099,10 @@ elif test $kde_qtver = 2; then
2099 2099
    AC_SUBST(LIB_KHTML, "-lkhtml")
2100 2100
    AC_SUBST(LIB_KSPELL, "-lkspell")
2101 2101
    AC_SUBST(LIB_KPARTS, "-lkparts")
2102
-   AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
2102
+   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
2103 2103
 else
2104
-   AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
2105
-   AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
2104
+   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
2105
+   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
2106 2106
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
2107 2107
    AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
2108 2108
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
@@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
2489 2489
   AC_MSG_RESULT(yes)
2490 2490
   AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
2491 2491
 else
2492
-  AC_MSG_ERROR(You need giflib30. Please install the kdesupport package)
2492
+  AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
2493 2493
 fi
2494 2494
 ])
2495 2495
 

+ 1
- 1
krename/Makefile.am View File

@@ -18,7 +18,7 @@ bin_PROGRAMS = krename
18 18
 
19 19
 # the application source, library search path, and link libraries
20 20
 
21
-krename_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
21
+krename_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
22 22
 krename_LDADD =$(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
23 23
 
24 24
 noinst_HEADERS = ProgressDialog.h dateplugin.h fileplugin.h kmylistbox.h krenameimpl.h \

Loading…
Cancel
Save