[Xfce4-commits] <xfce4-session:master> Use macro to search for sed.

[Nick Schermer]

Updating branch refs/heads/master
         to 12845022b85efcfc2919b79301c0203d7b0db14b (commit)
       from 72637bf591b1694812f6b89fcce9e4a8bbf4187b (commit)

commit 12845022b85efcfc2919b79301c0203d7b0db14b
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Apr 13 18:11:18 2012 +0200

    Use macro to search for sed.

 configure.in.in     |    1 +
 scripts/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index a9b56c5..d5a4b93 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -52,6 +52,7 @@ AC_PROG_CC()
 AM_PROG_CC_C_O()
 AC_PROG_INSTALL()
 AC_PROG_INTLTOOL()
+m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_CHECK_PROG(SED, sed, sed)])
 
 dnl check for libtool
 LT_PREREQ([2.2.6])
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b8877ed..1c0a5c0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -3,7 +3,7 @@ bin_SCRIPTS= \
 	xflock4
 
 # cannot be set from configure, because ${prefix} is not expanded
-edit = sed \
+edit = $(SED) \
 	-e "s, at _datadir_\@,$(datadir),g" \
 	-e "s, at _libdir_\@,$(libdir),g" \
 	-e "s, at _docdir_\@,$$(dirname $(docdir)),g" \