aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-07-24 13:27:19 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-07-24 13:27:19 +0800
commitc1dee244344d21d22213d97a62c3139d9607473b (patch)
tree020191d504b960e8947654432759b045385cea01
parent8c88d15dd503cab462365de378604fb83fd8a295 (diff)
downloadgsoc2013-evolution-c1dee244344d21d22213d97a62c3139d9607473b.tar
gsoc2013-evolution-c1dee244344d21d22213d97a62c3139d9607473b.tar.gz
gsoc2013-evolution-c1dee244344d21d22213d97a62c3139d9607473b.tar.bz2
gsoc2013-evolution-c1dee244344d21d22213d97a62c3139d9607473b.tar.lz
gsoc2013-evolution-c1dee244344d21d22213d97a62c3139d9607473b.tar.xz
gsoc2013-evolution-c1dee244344d21d22213d97a62c3139d9607473b.tar.zst
gsoc2013-evolution-c1dee244344d21d22213d97a62c3139d9607473b.zip
If no --with-kde-applnk-path is given, try to
detect the directory using `kde-config'. svn path=/trunk/; revision=17565
-rw-r--r--ChangeLog7
-rw-r--r--configure.in11
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index a295d2e3d5..2e67321a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-24 Ettore Perazzoli <ettore@ximian.com>
+
+ [Patch by Frank Belew <frb@ximian.com>.]
+
+ * configure.in: If no --with-kde-applnk-path is given, try to
+ detect the directory using `kde-config'.
+
2002-07-22 Dan Winship <danw@ximian.com>
* acinclude.m4: Move EVO_CHECK_LIB into here, and also create
diff --git a/configure.in b/configure.in
index aef1c3f008..e1f299df48 100644
--- a/configure.in
+++ b/configure.in
@@ -1059,17 +1059,20 @@ dnl KDE applnk directory
dnl ********************
AC_ARG_WITH(kde-applnk-path, [ --with-kde-applnk-path=PATH Location of KDE applnk files],
[with_kde_applnk_path="$withval"])
-AC_MSG_CHECKING(for the KDE applnk directory)
if test -z "$with_kde_applnk_path"; then
with_kde_applnk_path="$prefix/share/applnk"
fi
if test -d "$with_kde_applnk_path" ; then
- AC_MSG_RESULT("$with_kde_applnk_path" found)
AC_DEFINE(HAVE_KDE_APPLNK)
KDE_APPLNK_DIR="$with_kde_applnk_path"
else
- AC_MSG_RESULT(not found)
- KDE_APPLNK_DIR=""
+ AC_PATH_PROG(KDECONFIG, kde-config)
+ if test -n "$KDECONFIG"; then
+ KDE_APPLNK_DIR=`$KDECONFIG --expandvars --install apps`
+ AC_DEFINE(HAVE_KDE_APPLNK)
+ else
+ KDE_APPLNK_DIR=""
+ fi
fi
AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x)
AC_SUBST(KDE_APPLNK_DIR)