Re: [evolution-patches] Fix for #39128

[Rodney Dawes <dobey ximian com>]

On Mon, 2003-04-21 at 06:37, Ettore Perazzoli wrote:
>          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 you make it be "no" by default then this fallback doesn't make much
> sense anymore.

What if one does --with-kde-applnk-path without passing the =PATH part?
Maybe I am just not fully understanding how AC_ARG_FOO() works, or
something, but it makes sense to me looking at it, and it works, as-is
in my patch.

>                 if test -d "$with_kde_applnk_path" ; then
>                         KDE_APPLNK_DIR="$with_kde_applnk_path"
> 
> Probably it would be better to change this too, so if the directory
> doesn't exist it errors out instead of silently ignoring the option.

We do mkinstalldirs anyway, so if the directory doesn't exist, it will
get created. I just removed the check to see if it exists, since it is
actually broken anyway.

> The rest looks good.

Here's a slightly-updated patch.

-- 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	21 Apr 2003 17:11:00 -0000
@@ -1,3 +1,8 @@
+2003-04-21  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	21 Apr 2003 17:11:01 -0000
@@ -1259,21 +1259,13 @@
 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"
-	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
+		with_kde_applnk_path="$datadir/applnk"
 	fi
+	KDE_APPLNK_DIR="$with_kde_applnk_path"
 else
 	KDE_APPLNK_DIR=""
 fi