summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-10 15:40:22 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-05-10 15:40:22 -0500
commit136d2c861321d51ac3ab1ab82ca602717158c766 (patch)
tree5c47ff80add8df4ce045a8956f96661c4893a0c8
parent51ff06f0c1c6981694fe60a20870de26749b895f (diff)
downloadkvirc-136d2c861321d51ac3ab1ab82ca602717158c766.tar.gz
kvirc-136d2c861321d51ac3ab1ab82ca602717158c766.zip
Update Automake to properly detect TDE path
Thanks to Slávek Banko for the initial patch!
-rw-r--r--acinclude.m411
-rw-r--r--admin/acinclude.m4.in11
-rw-r--r--src/kvirc/kernel/kvi_app_fs.cpp2
-rw-r--r--src/kvirc/kernel/kvi_app_setup.cpp1
-rw-r--r--src/modules/mediaplayer/Makefile.am2
-rw-r--r--src/modules/torrent/Makefile.am2
6 files changed, 20 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index c79e768f..563500f3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2158,7 +2158,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$TDEDIR"; then
ss_kde_general_test_dirs="$TDEDIR $ss_kde_general_test_dirs"
fi
- ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
+ ss_kde_general_test_path_suffix="trinity tde TDE kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
@@ -2522,9 +2522,14 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR"
SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
- SS_LIBLINK="-ltdecore -ltdeui -lkparts $SS_LIBLINK"
+ SS_LIBLINK="-ltdecore -ltdeui -lkparts -lDCOP -ltdefx -lkio $SS_LIBLINK"
AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support])
+ AC_DEFINE_UNQUOTED([TDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support])
+ AC_DEFINE_UNQUOTED([TDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support])
SS_BUILD_FLAGS="k$SS_BUILD_FLAGS"
+ else
+ AC_DEFINE_UNQUOTED([TDE_DIR], "", [contain path to TDE if compiled with the TDE support])
+ AC_DEFINE_UNQUOTED([TDE_LIBDIR], "", [contain path to TDE libs if compiled with the TDE support])
fi
if test -n "$SS_OTHER_LIBLINK"; then
@@ -2533,7 +2538,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
if test -n "$SS_OTHER_LIBDIRS"; then
SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
- $SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
+ SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
fi
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 4df7e443..3568bca7 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2185,7 +2185,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$TDEDIR"; then
ss_kde_general_test_dirs="$TDEDIR $ss_kde_general_test_dirs"
fi
- ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
+ ss_kde_general_test_path_suffix="trinity tde TDE kde kde3.0 kde3 KDE Kde KDE3 kde3 ."
AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR)
@@ -2549,9 +2549,14 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR"
SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
- SS_LIBLINK="-ltdecore -ltdeui -lkparts $SS_LIBLINK"
+ SS_LIBLINK="-ltdecore -ltdeui -lkparts -lDCOP -ltdefx -lkio $SS_LIBLINK"
AC_DEFINE([COMPILE_TDE_SUPPORT], 1, [define if you want to compile the TDE support])
+ AC_DEFINE_UNQUOTED([TDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to TDE if compiled with the TDE support])
+ AC_DEFINE_UNQUOTED([TDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to TDE libs if compiled with the TDE support])
SS_BUILD_FLAGS="k$SS_BUILD_FLAGS"
+ else
+ AC_DEFINE_UNQUOTED([TDE_DIR], "", [contain path to TDE if compiled with the TDE support])
+ AC_DEFINE_UNQUOTED([TDE_LIBDIR], "", [contain path to TDE libs if compiled with the TDE support])
fi
if test -n "$SS_OTHER_LIBLINK"; then
@@ -2560,7 +2565,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
if test -n "$SS_OTHER_LIBDIRS"; then
SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS"
- $SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
+ SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g`
SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
fi
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index ad8ce5ab..42d23706 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -55,7 +55,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
// Local hack for Debian
case Modules :
- case Plugins : szData = "/opt/kde3/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break;
+ case Plugins : szData = TDE_LIBDIR "/kvirc/" KVI_VERSION_BRANCH "/modules"; break;
case EasyPlugins : szData.append("easyplugins"); break;
case ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index b54760b8..77ad3af7 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -500,6 +500,7 @@ void KviApp::setupFileAssociations()
#ifndef COMPILE_ON_WINDOWS
const char * usualKvircGlobalPrePath[]=
{
+ TDE_DIR,
"/usr/local", "/opt/kde", "/usr",
"/usr/local/lib", "/opt/kde3", "/usr/lib",
"/usr/local/kde", "/opt", "/usr/etc",
diff --git a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am
index af5caa60..41e5b850 100644
--- a/src/modules/mediaplayer/Makefile.am
+++ b/src/modules/mediaplayer/Makefile.am
@@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimediaplayer.la
#%.moc: %.h
# $(SS_QT_MOC) $< -o $@
-libkvimediaplayer_la_LDFLAGS = -avoid-version -module
+libkvimediaplayer_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \
mp_amarokinterface.cpp \
diff --git a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am
index ab0d80cb..fff58478 100644
--- a/src/modules/torrent/Makefile.am
+++ b/src/modules/torrent/Makefile.am
@@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitorrent.la
#%.moc: %.h
# $(SS_QT_MOC) $< -o $@
-libkvitorrent_la_LDFLAGS = -avoid-version -module
+libkvitorrent_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS)
libkvitorrent_la_SOURCES = libkvitorrent.cpp \
tc_interface.cpp \