TDE
/
kvirc
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kvirc
0
0
Fork 0
Code Issues Releases Wiki Activity

Update Automake to properly detect TDE path

Browse Source 
Thanks to Slávek Banko for the initial patch!
(cherry picked from commit 136d2c8613)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent 99ea7efe29
commit aa53268d46
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File

11
acinclude.m4
Unescape Escape View File

@ -2149,7 +2149,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$KDEDIR"; then if test -n "$KDEDIR"; then
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs" ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
fi 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) 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)
@ -2513,9 +2513,14 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR"
SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK" SS_LIBLINK="-lkdecore -lkdeui -lkparts -lDCOP -lkdefx -lkio $SS_LIBLINK"
AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support]) AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x 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" 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 fi
if test -n "$SS_OTHER_LIBLINK"; then if test -n "$SS_OTHER_LIBLINK"; then
@ -2524,7 +2529,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
if test -n "$SS_OTHER_LIBDIRS"; then if test -n "$SS_OTHER_LIBDIRS"; then
SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS" 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" SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
fi fi

11
admin/acinclude.m4.in
Unescape Escape View File

@ -2149,7 +2149,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR],
if test -n "$KDEDIR"; then if test -n "$KDEDIR"; then
ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs" ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs"
fi 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) 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)
@ -2513,9 +2513,14 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR"
SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR"
SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR"
SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK" SS_LIBLINK="-lkdecore -lkdeui -lkparts -lDCOP -lkdefx -lkio $SS_LIBLINK"
AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support]) AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x 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" 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 fi
if test -n "$SS_OTHER_LIBLINK"; then if test -n "$SS_OTHER_LIBLINK"; then
@ -2524,7 +2529,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
if test -n "$SS_OTHER_LIBDIRS"; then if test -n "$SS_OTHER_LIBDIRS"; then
SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS" 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" SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS"
fi fi

2
src/kvirc/kernel/kvi_app_fs.cpp
Unescape Escape View File

@ -55,7 +55,7 @@ void KviApp::getGlobalKvircDirectory(TQString &szData,KvircSubdir dir,const TQSt
// Local hack for Debian // Local hack for Debian
case Modules : 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 EasyPlugins : szData.append("easyplugins"); break;
case ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break; case ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break;

1
src/kvirc/kernel/kvi_app_setup.cpp
Unescape Escape View File

@ -500,6 +500,7 @@ void KviApp::setupFileAssociations()
#ifndef COMPILE_ON_WINDOWS #ifndef COMPILE_ON_WINDOWS
const char * usualKvircGlobalPrePath[]= const char * usualKvircGlobalPrePath[]=
{ {
TDE_DIR,
"/usr/local", "/opt/kde", "/usr", "/usr/local", "/opt/kde", "/usr",
"/usr/local/lib", "/opt/kde3", "/usr/lib", "/usr/local/lib", "/opt/kde3", "/usr/lib",
"/usr/local/kde", "/opt", "/usr/etc", "/usr/local/kde", "/opt", "/usr/etc",

2
src/modules/mediaplayer/Makefile.am
Unescape Escape View File

@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvimediaplayer.la
#%.moc: %.h #%.moc: %.h
# $(SS_QT_MOC) $< -o $@ # $(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 \ libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \
mp_amarokinterface.cpp \ mp_amarokinterface.cpp \

2
src/modules/torrent/Makefile.am
Unescape Escape View File

@ -10,7 +10,7 @@ pluglib_LTLIBRARIES = libkvitorrent.la
#%.moc: %.h #%.moc: %.h
# $(SS_QT_MOC) $< -o $@ # $(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 \ libkvitorrent_la_SOURCES = libkvitorrent.cpp \
tc_interface.cpp \ tc_interface.cpp \

Write Preview
Loading…
Cancel
Save