diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:13:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:13:14 -0600 |
| commit | d5ebce0350675ec687fa03b956880a74c5d88282 (patch) | |
| tree | 1d1a7d9304cad3d1b732f939446c4cb87e575fd1 | |
| parent | 07af34f24b8625c9510d69e104c722e1566adeb6 (diff) | |
| download | potracegui-d5ebce0350675ec687fa03b956880a74c5d88282.tar.gz potracegui-d5ebce0350675ec687fa03b956880a74c5d88282.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | acinclude.m4 | 18 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index c91210d..62ba0a9 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2022,11 +2022,11 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KABC, "-lkabc") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") - AC_SUBST(LIB_KUTILS, "-lkutils") + AC_SUBST(LIB_KUTILS, "-ltdeutils") AC_SUBST(LIB_TDEPIM, "-ltdepim") # these are for backward compatibility AC_SUBST(LIB_KSYCOCA, "-lkio") @@ -2035,13 +2035,13 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") - AC_SUBST(LIB_KSYCOCA, "-lksycoca") + AC_SUBST(LIB_KSYCOCA, "-ltdesycoca") AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KAB, "-lkab") - AC_SUBST(LIB_KHTML, "-lkhtml") - AC_SUBST(LIB_KSPELL, "-lkspell") - AC_SUBST(LIB_KPARTS, "-lkparts") + AC_SUBST(LIB_KHTML, "-ltdehtml") + AC_SUBST(LIB_KSPELL, "-ltdespell") + AC_SUBST(LIB_KPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") @@ -2483,7 +2483,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir) test "x$jpeg_incdir" = xNO && jpeg_incdir= dnl if headers _and_ libraries are missing, this is no error, and we -dnl continue with a warning (the user will get no jpeg support in khtml) +dnl continue with a warning (the user will get no jpeg support in tdehtml) dnl if only one is missing, it means a configuration error, but we still dnl only warn if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then diff --git a/src/Makefile.am b/src/Makefile.am index 4fd62f7..1eb09ab 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = potracegui # the application source, library search path, and link libraries potracegui_SOURCES = main.cpp potracegui.cpp autotraceformats.cpp MainWidgetBase.ui mainwidget.cpp options.cpp -potracegui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +potracegui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor potracegui_LDADD = $(LIB_KIO) $(LIB_TDEUI) # this is where the desktop file will go |