[evolution-patches] Patch for 39128

[Rodney Dawes <dobey ximian com>]

This is a patch to fix 39128 by not trying to install into a different
prefix, and instead, just always insatlling a .desktop file into the
kde applnk path.

-- dobey

Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.574
diff -u -r1.574 configure.in
--- configure.in	7 Apr 2003 19:12:46 -0000	1.574
+++ configure.in	9 Apr 2003 16:55:03 -0000
@@ -1029,7 +1029,6 @@
 dnl CFLAGS and LIBS and stuff
 dnl *************************
 
-GNOME_COMPILE_WARNINGS(yes)
 CFLAGS="$CFLAGS $WARN_CFLAGS"
 
 AM_PATH_ORBIT2
@@ -1254,31 +1253,6 @@
 dnl ******************
 AC_ARG_WITH(sub-version, [  --with-sub-version=VERSION Specify a sub-version string])
 AC_DEFINE_UNQUOTED(SUB_VERSION, "$with_sub_version", [Version substring, for packagers])
-
-dnl ********************
-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"])
-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"
-	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=""
-fi
-AM_CONDITIONAL(HAVE_KDE_APPLNK, test x"$KDE_APPLNK_DIR" != x)
-AC_SUBST(KDE_APPLNK_DIR)
 
 dnl ******************************
 dnl Makefiles
Index: data/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/data/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- data/Makefile.am	6 Apr 2003 16:09:08 -0000	1.17
+++ data/Makefile.am	9 Apr 2003 16:55:03 -0000
@@ -11,20 +11,13 @@
 mimedir = $(datadir)/mime-info
 mime_file = evolution.mime
 
-if HAVE_KDE_APPLNK
-
-kdedesktopdir = $(KDE_APPLNK_DIR)/Applications
+kdedesktopdir = $(datadir)/applnk/Applications
 kdedesktop_file = $(desktop_in_file:.desktop.in=.desktop)
 
 install-kde-applnk:
 	$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir);	\
 	$(INSTALL_DATA) $(kdedesktop_file) \
 		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
-else
-
-install-kde-applnk:
-
-endif
 
 noinst_MANS = evolution.1
 noinst_DATA = $(keys_file)