From 2bc81c527704c280323a8b1ab16338e132ecdd46 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 17 May 2010 15:42:11 -0400
Subject: Bug 617865 - Various data file cleanups

- Install evolution-alarm-notify in $(privlibexecdir) instead of
  $(bindir).

- Set the X-GNOME-Bugzilla-Version in evolution-alarm-notify.desktop to
  @BASE_VERSION@.x (patch was missing the .x suffix).

- Killed data/evolution.keys.in.in since it's full of CORBA cruft.
  The MimeType field in evolution.desktop fills this role now.

- Copied the AS_AC_EXPAND macro from gnome-settings-daemon.  The macro
  sets up path-related substitutions for use in automake input files.

  So for example AS_AC_EXPAND(PRIVLIBEXECDIR, "$privlibexecdir") in
  configure.ac allows us to use @PRIVLIBEXECDIR@ in .desktop.in files.

- Simplified .desktop rules using gnome-settings-daemon as a guide.
---
 m4/as-ac-expand.m4 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 m4/as-ac-expand.m4

(limited to 'm4')

diff --git a/m4/as-ac-expand.m4 b/m4/as-ac-expand.m4
new file mode 100644
index 0000000000..8bd95a85cc
--- /dev/null
+++ b/m4/as-ac-expand.m4
@@ -0,0 +1,50 @@
+dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
+dnl autostars m4 macro for expanding directories using configure's prefix
+
+dnl (C) 2003, 2004, 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+
+dnl Copying and distribution of this file, with or without modification,
+dnl are permitted in any medium without royalty provided the copyright
+dnl notice and this notice are preserved.
+
+dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
+
+dnl example:
+dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
+
+AC_DEFUN([AS_AC_EXPAND],
+[
+  EXP_VAR=[$1]
+  FROM_VAR=[$2]
+
+  dnl first expand prefix and exec_prefix if necessary
+  prefix_save=$prefix
+  exec_prefix_save=$exec_prefix
+
+  dnl if no prefix given, then use /usr/local, the default prefix
+  if test "x$prefix" = "xNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  dnl if no exec_prefix given, then use prefix
+  if test "x$exec_prefix" = "xNONE"; then
+    exec_prefix=$prefix
+  fi
+
+  full_var="$FROM_VAR"
+  dnl loop until it doesn't change anymore
+  while true; do
+    new_full_var="`eval echo $full_var`"
+    if test "x$new_full_var" = "x$full_var"; then break; fi
+    full_var=$new_full_var
+  done
+
+  dnl clean up
+  full_var=$new_full_var
+  AC_SUBST([$1], "$full_var")
+
+  dnl restore prefix and exec_prefix
+  prefix=$prefix_save
+  exec_prefix=$exec_prefix_save
+])
+
-- 
cgit v1.2.3