summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun McCance <shaunm@src.gnome.org>2004-03-22 01:29:30 +0000
committerShaun McCance <shaunm@src.gnome.org>2004-03-22 01:29:30 +0000
commit0acafbfe49a5975303c75679b183ed0def7e0f68 (patch)
tree846c205f2c493b108c4166f7ac76fd10241b2df1
parent3568bf67242e976528dfc436bc7697554356b9e4 (diff)
downloadyelp-0acafbfe49a5975303c75679b183ed0def7e0f68.tar.gz
- Patch from Laszlo Peter for #134534, portable sed usage
* configure.in: - Patch from Laszlo Peter for #134534, portable sed usage
-rw-r--r--ChangeLog5
-rw-r--r--configure.in6
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e6ae246c..0f74aff8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-21 Shaun McCance <shaunm@gnome.org>
+
+ * configure.in:
+ - Patch from Laszlo Peter for #134534, portable sed usage
+
2004-03-20 Gareth Owen <gowen72@yahoo.com>
* configure.in: Added en_GB to ALL_LINGUAS
diff --git a/configure.in b/configure.in
index 3fc04850..549f0f1e 100644
--- a/configure.in
+++ b/configure.in
@@ -60,11 +60,7 @@ YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
idl_dirs="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
AC_PATH_PROGS(SED, gsed sed)
-if ${SED} --version 2>/dev/null | grep GNU >/dev/null 2>&1; then
- YELP_IDL_INCLUDES="`echo ${idl_dirs} | ${SED} -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`"
-else
- YELP_IDL_INCLUDES="`echo ${idl_dirs} | ${SED} -E -e 's/^/ /' -e 's/ +$//' -e 's/ +/ -I /g' -e 's/^ +//'`"
-fi
+YELP_IDL_INCLUDES="`echo ${idl_dirs} | ${SED} -e 's/^/ /' -e 's/ *$//' -e 's/ */ -I /g' -e 's/^ *//'`"
AC_SUBST(YELP_IDL_INCLUDES)
dnl Check for whereis