Mercurial > hg > octave-lyh
changeset 6957:768a19157591
[project @ 2007-10-04 17:58:36 by jwe]
| author | jwe |
|---|---|
| date | Thu, 04 Oct 2007 17:58:36 +0000 |
| parents | cc712c417943 |
| children | a18c784ae599 |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 8 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-10-04 John W. Eaton <jwe@octave.org> + + * configure.in (UGLY_DEFS): Delete special case for darwin. + 2007-10-03 John W. Eaton <jwe@octave.org> * aclocal.m4 (OCTAVE_PROG_SED): Also check for \(X\|Y\) style
--- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.576 $) +AC_REVISION($Revision: 1.577 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1788,18 +1788,9 @@ AC_OUTPUT_MAKE_DEFS - -dnl Maybe this should really be conditional on "broken sed", or -dnl "broken shell backslash quoting" or somesuch. -dnl -case "$canonical_host_type" in - *-*-darwin*) - UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\",g'` - ;; - *) - UGLY_DEFS=`echo $DEFS | sed 's,\\",\\\\\\\\\\\\\\\\\\",g'` - ;; -esac +### We have to insert extra levels of backslash quoting here so that +### the right thing ends up in oct-conf.h. +UGLY_DEFS=`echo $DEFS | $(SED) 's,\\",\\\\\\\\\\\\\\\\\\",g'` AC_MSG_NOTICE([defining UGLY_DEFS to be $UGLY_DEFS]) AC_SUBST(UGLY_DEFS)