diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-05-10 15:40:22 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-05 20:47:56 +0200 |
| commit | aa53268d4693062844412e9061f2892487b087a5 (patch) | |
| tree | ba5417e3b32c36de3d390c91ccdb985621ef73f4 /admin/acinclude.m4.in | |
| parent | 99ea7efe29f8d69ca3c962f48193cf14e1042740 (diff) | |
| download | kvirc-aa53268d4693062844412e9061f2892487b087a5.tar.gz kvirc-aa53268d4693062844412e9061f2892487b087a5.zip | |
Update Automake to properly detect TDE path
Thanks to Slávek Banko for the initial patch!
(cherry picked from commit 136d2c861321d51ac3ab1ab82ca602717158c766)
Diffstat (limited to 'admin/acinclude.m4.in')
| -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 3cb36389..747084c5 100644 --- a/admin/acinclude.m4.in +++ b/admin/acinclude.m4.in @@ -2149,7 +2149,7 @@ AC_DEFUN([AC_SS_FIND_KDE_GENERAL_DIR], if test -n "$KDEDIR"; then ss_kde_general_test_dirs="$KDEDIR $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) @@ -2513,9 +2513,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="-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_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 @@ -2524,7 +2529,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 |