diff options
| author | Timothy Pearson <[email protected]> | 2012-05-10 15:40:22 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-05-10 15:40:22 -0500 |
| commit | 136d2c861321d51ac3ab1ab82ca602717158c766 (patch) | |
| tree | 5c47ff80add8df4ce045a8956f96661c4893a0c8 /admin | |
| parent | 51ff06f0c1c6981694fe60a20870de26749b895f (diff) | |
| download | kvirc-136d2c861321d51ac3ab1ab82ca602717158c766.tar.gz kvirc-136d2c861321d51ac3ab1ab82ca602717158c766.zip | |
Update Automake to properly detect TDE path
Thanks to Slávek Banko for the initial patch!
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/acinclude.m4.in | 11 |
1 files changed, 8 insertions, 3 deletions
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 |