Browse Source

Rename a number of libraries and executables to avoid conflicts with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
69eead7d2e
3 changed files with 15 additions and 15 deletions
  1. 13
    13
      acinclude.m4
  2. 1
    1
      krename/Makefile.am
  3. 1
    1
      krename/replacedialog.cpp

+ 13
- 13
acinclude.m4 View File

@@ -2075,16 +2075,16 @@ if test $kde_qtver = 3; then
2075 2075
    AC_SUBST(LIB_SMB, "-lsmb")
2076 2076
    AC_SUBST(LIB_KAB, "-lkab")
2077 2077
    AC_SUBST(LIB_KABC, "-lkabc")
2078
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2079
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2080
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2078
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
2079
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
2080
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2081 2081
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2082
-   AC_SUBST(LIB_KUTILS, "-lkutils")
2082
+   AC_SUBST(LIB_KUTILS, "-ltdeutils")
2083 2083
    AC_SUBST(LIB_TDEPIM, "-ltdepim")
2084
-   AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
2084
+   AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
2085 2085
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
2086
-   AC_SUBST(LIB_KDNSSD, "-lkdnssd")
2087
-   AC_SUBST(LIB_KUNITTEST, "-lkunittest")
2086
+   AC_SUBST(LIB_KDNSSD, "-ltdednssd")
2087
+   AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
2088 2088
 # these are for backward compatibility
2089 2089
    AC_SUBST(LIB_KSYCOCA, "-lkio")
2090 2090
    AC_SUBST(LIB_KFILE, "-lkio")
@@ -2092,13 +2092,13 @@ elif test $kde_qtver = 2; then
2092 2092
    AC_SUBST(LIB_TDECORE, "-ltdecore")
2093 2093
    AC_SUBST(LIB_TDEUI, "-ltdeui")
2094 2094
    AC_SUBST(LIB_KIO, "-lkio")
2095
-   AC_SUBST(LIB_KSYCOCA, "-lksycoca")
2095
+   AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
2096 2096
    AC_SUBST(LIB_SMB, "-lsmb")
2097 2097
    AC_SUBST(LIB_KFILE, "-lkfile")
2098 2098
    AC_SUBST(LIB_KAB, "-lkab")
2099
-   AC_SUBST(LIB_KHTML, "-lkhtml")
2100
-   AC_SUBST(LIB_KSPELL, "-lkspell")
2101
-   AC_SUBST(LIB_KPARTS, "-lkparts")
2099
+   AC_SUBST(LIB_KHTML, "-ltdehtml")
2100
+   AC_SUBST(LIB_KSPELL, "-ltdespell")
2101
+   AC_SUBST(LIB_KPARTS, "-ltdeparts")
2102 2102
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
2103 2103
 else
2104 2104
    AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
@@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
2547 2547
 test "x$jpeg_incdir" = xNO && jpeg_incdir=
2548 2548
 
2549 2549
 dnl if headers _and_ libraries are missing, this is no error, and we
2550
-dnl continue with a warning (the user will get no jpeg support in khtml)
2550
+dnl continue with a warning (the user will get no jpeg support in tdehtml)
2551 2551
 dnl if only one is missing, it means a configuration error, but we still
2552 2552
 dnl only warn
2553 2553
 if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@@ -3489,7 +3489,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
3489 3489
 KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
3490 3490
 AC_SUBST(KDE_PLUGIN)
3491 3491
 
3492
-# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs.
3492
+# This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
3493 3493
 KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
3494 3494
 AC_SUBST(KDE_CHECK_PLUGIN)
3495 3495
 

+ 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
21
+krename_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
22 22
 krename_LDADD =$(LIB_KPARTS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET)
23 23
 
24 24
 noinst_HEADERS = ProgressDialog.h dateplugin.h fileplugin.h kmylistbox.h krenameimpl.h \

+ 1
- 1
krename/replacedialog.cpp View File

@@ -31,7 +31,7 @@
31 31
 #include <klocale.h>
32 32
 #include <klistview.h>
33 33
 #include <kmessagebox.h>
34
-#include <kparts/componentfactory.h>
34
+#include <tdeparts/componentfactory.h>
35 35
 #include <kpushbutton.h>
36 36
 #include <kregexpeditorinterface.h>
37 37
 

Loading…
Cancel
Save