diff options
| author | Shaun McCance <shaunm@src.gnome.org> | 2004-02-16 22:03:18 +0000 |
|---|---|---|
| committer | Shaun McCance <shaunm@src.gnome.org> | 2004-02-16 22:03:18 +0000 |
| commit | d5ce8c4e84052cb322595553848208a41a110e3b (patch) | |
| tree | 4156fc2091317fafae6930c6553ae1e59500de4f | |
| parent | 0eaf7f47c63a45ca3293735180c8a496ae801430 (diff) | |
| download | yelp-d5ce8c4e84052cb322595553848208a41a110e3b.tar.gz | |
- Patch from Julio M. Merino Vidal for portable sed usage (#134534)
* configure.in:
- Patch from Julio M. Merino Vidal for portable sed usage (#134534)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2004-02-16 Shaun McCance <shaunm@gnome.org> + + * configure.in: + - Patch from Julio M. Merino Vidal for portable sed usage (#134534) + 2004-02-15 Shaun McCance <shaunm@gnome.org> * src/yelp-db-pager.c: diff --git a/configure.in b/configure.in index 40a62267..459f3c15 100644 --- a/configure.in +++ b/configure.in @@ -58,7 +58,13 @@ CFLAGS="$YELP_CFLAGS $CFLAGS" YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0" -YELP_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0| sed -e 's/^/ /' -e 's/ \+$//' -e 's/ \+/ -I /g' -e 's/^ \+//'`" +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 AC_SUBST(YELP_IDL_INCLUDES) dnl Check for whereis |