[vinagre] Check for sed with AC_PROG_SED

[David King <davidk src gnome org>]

commit 17f4d2dbbd9d206a07b3bee73f516737805e3aad
Author: David King <amigadave amigadave com>
Date:   Mon Mar 7 17:23:46 2011 +0100

    Check for sed with AC_PROG_SED
    
    Use the resulting variable 'SED' in Makefile.am files. Update
    vinagre/GNOME_VinagreApplet.server.in.in appropriately.

 configure.ac                             |    2 ++
 data/Makefile.am                         |    2 +-
 vinagre/GNOME_VinagreApplet.server.in.in |    4 ++--
 vinagre/Makefile.am                      |    6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 965a3ec..fabcf84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,6 +20,8 @@ LT_INIT([disable-static])
 
 PKG_PROG_PKG_CONFIG([0.16])
 
+AC_PROG_SED
+
 # TODO: Bump before release with GTK+ 3 support.
 # TODO: Use in name of pkg-config file, plugin path and where appropriate.
 AC_SUBST([VINAGRE_API_VERSION], [1.0])
diff --git a/data/Makefile.am b/data/Makefile.am
index 7c94144..fcaf703 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -61,7 +61,7 @@ service_DATA = org.freedesktop.Telepathy.Client.Vinagre.service
 
 org.freedesktop.Telepathy.Client.Vinagre.service: org.freedesktop.Telepathy.Client.Vinagre.service.in \
 		Makefile
-	$(AM_V_GEN)sed -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
+	$(AM_V_GEN)$(SED) -e "s|[ ]bindir[@]|$(bindir)|" $< > $@
 endif
 
 UPDATE_MIME = \
diff --git a/vinagre/GNOME_VinagreApplet.server.in.in b/vinagre/GNOME_VinagreApplet.server.in.in
index 9bf54e1..5c19768 100644
--- a/vinagre/GNOME_VinagreApplet.server.in.in
+++ b/vinagre/GNOME_VinagreApplet.server.in.in
@@ -13,7 +13,7 @@
      <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
      <oaf_attribute name="bugzilla:product" type="string" value="vinagre"/>
      <oaf_attribute name="bugzilla:component" type="string" value="applet"/>
-     <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
+     <oaf_attribute name="bugzilla:version" type="string" value="@PACKAGE_VERSION@"/>
      <oaf_attribute name="bugzilla:other_binaries" type="string" value="vinagre-applet"/>
     </oaf_attribute>
   </oaf_server>
@@ -32,7 +32,7 @@
     <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
     <oaf_attribute name="bugzilla:product" type="string" value="vinagre"/>
     <oaf_attribute name="bugzilla:component" type="string" value="applet"/>
-    <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/>
+    <oaf_attribute name="bugzilla:version" type="string" value="@PACKAGE_VERSION@"/>
     <oaf_attribute name="bugzilla:other_binaries" type="string" value="vinagre-applet"/>
   </oaf_server>
 </oaf_info>
diff --git a/vinagre/Makefile.am b/vinagre/Makefile.am
index fd16c19..0e41740 100644
--- a/vinagre/Makefile.am
+++ b/vinagre/Makefile.am
@@ -143,7 +143,7 @@ server_DATA =					\
 	$(server_in_files:.server.in=.server)
 
 $(server_in_files): $(server_in_files:.server.in=.server.in.in)
-	$(AM_V_GEN)sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" -e "s|\ VERSION\@|$(VERSION)|" $< > $@
+	$(AM_V_GEN)$(SED) -e "s|\ LIBEXECDIR\@|$(libexecdir)|" -e "s|\ PACKAGE_VERSION\@|$(PACKAGE_VERSION)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
@@ -234,9 +234,9 @@ vinagre-enums.h: $(vinagre_enum_headers)
 
 vinagre-marshal.list: $(handwritten_sources) Makefile.am
 	$(AM_V_GEN)( cd $(srcdir) && \
-	sed -n -e 's/.*vinagre_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
+	$(SED) -n -e 's/.*vinagre_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \
 	$(handwritten_sources) ) \
-	| sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp && \
+	| $(SED) -e 's/__/:/' -e 'y/_/,/' | sort -u > $  tmp && \
 	if cmp -s $  tmp $@; then \
 		rm $  tmp; \
 	else \