[evolution-patches] Fix for #39128

[Rodney Dawes <dobey ximian com>]

Here's a patch to fix 39128 and disable installing to the kde applnk
path by default. You have to explicitly do --with-kde-applnk-path to
get it to work.

-- dobey

? autom4te.cache
? autoregen.sh
? stamp-h1
? addressbook/backend/ebook/Evolution-Composer-common.c
? addressbook/backend/ebook/Evolution-Composer-skels.c
? addressbook/backend/ebook/Evolution-Composer-stubs.c
? addressbook/backend/ebook/Evolution-Composer.h
? calendar/gui/dialogs/Evolution-Addressbook-SelectNames-common.c
? calendar/gui/dialogs/Evolution-Addressbook-SelectNames-skels.c
? calendar/gui/dialogs/Evolution-Addressbook-SelectNames-stubs.c
? help/C/evolution-1.4-C.omf.out
? help/C/omf_timestamp
? shell/ChangeLog.new
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1191
diff -u -r1.1191 ChangeLog
--- ChangeLog	11 Apr 2003 19:48:20 -0000	1.1191
+++ ChangeLog	18 Apr 2003 21:58:28 -0000
@@ -1,3 +1,8 @@
+2003-04-18  Rodney Dawes  <dobey ximian com>
+
+	* configure.in: Fix KDE_APPLNK_DIR to not install to a diff prefix,
+	and disable installing the file to the KDE applnk path by default
+	
 2003-04-11  Ettore Perazzoli  <ettore ximian com>
 
 	* configure.in: 1.3.2.99.
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.576
diff -u -r1.576 configure.in
--- configure.in	11 Apr 2003 19:48:20 -0000	1.576
+++ configure.in	18 Apr 2003 21:58:29 -0000
@@ -1259,20 +1259,14 @@
 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"])
+            [with_kde_applnk_path="$withval"],
+	    [with_kde_applnk_path="no"])
 if test x"$with_kde_applnk_path" != x"no"; then
 	if test -z "$with_kde_applnk_path"; then
-		with_kde_applnk_path="$prefix/share/applnk"
+		with_kde_applnk_path="$datadir/applnk"
 	fi
 	if test -d "$with_kde_applnk_path" ; then
 		KDE_APPLNK_DIR="$with_kde_applnk_path"
-	else
-		AC_PATH_PROG(KDECONFIG, kde-config)
-		if test -n "$KDECONFIG"; then
-			KDE_APPLNK_DIR=`$KDECONFIG --expandvars --install apps`
-		else
-			KDE_APPLNK_DIR=""
-		fi
 	fi
 else
 	KDE_APPLNK_DIR=""