diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-10-19 10:38:07 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-10-19 11:23:47 +0200 |
| commit | 209a1a065ec056c35f30f1127e7255e49c7ab662 (patch) | |
| tree | 0b763f16bd34305b6c75d21f6b434b731d4da351 | |
| parent | d1a06d87a70c6a1f0588a70c91c182f6873aae41 (diff) | |
| download | gnulib-209a1a065ec056c35f30f1127e7255e49c7ab662.tar.gz | |
Support for old NeXTstep 3.3 sed.
* m4/absolute-header.m4 (gl_ABSOLUTE_HEADER_ONE): In the sed address
part, use /.../, not \|...|. Escape periods in the header file name.
* m4/include_next.m4 (gl_NEXT_HEADERS_INTERNAL): Likewise.
Reported by Daniel Richard G. <skunk@iskunk.org>.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/absolute-header.m4 | 13 | ||||
| -rw-r--r-- | m4/include_next.m4 | 13 |
3 files changed, 26 insertions, 8 deletions
@@ -1,3 +1,11 @@ +2011-10-19 Bruno Haible <bruno@clisp.org> + + Support for old NeXTstep 3.3 sed. + * m4/absolute-header.m4 (gl_ABSOLUTE_HEADER_ONE): In the sed address + part, use /.../, not \|...|. Escape periods in the header file name. + * m4/include_next.m4 (gl_NEXT_HEADERS_INTERNAL): Likewise. + Reported by Daniel Richard G. <skunk@iskunk.org>. + 2011-10-18 Daniel Richard G. <skunk@iskunk.org> (tiny change) Support for old NeXTstep 3.3 gcc. diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 index b7276a3b2b..400de55353 100644 --- a/m4/absolute-header.m4 +++ b/m4/absolute-header.m4 @@ -1,4 +1,4 @@ -# absolute-header.m4 serial 15 +# absolute-header.m4 serial 16 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -78,11 +78,16 @@ changequote(,) gl_dirsep_regex='[/\\]' ;; *) - gl_dirsep_regex='/' + gl_dirsep_regex='\/' ;; esac - gl_absolute_header_sed='\|'"${gl_dirsep_regex}"'$1|{ - s|.*"\(.*'"${gl_dirsep_regex}"'$1\)".*|\1| + dnl A sed expression that turns a string into a basic regular + dnl expression, for use within "/.../". + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo '$1' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ s|^/[^/]|//&| p q diff --git a/m4/include_next.m4 b/m4/include_next.m4 index d5230ced8d..8a1fab66d1 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,4 +1,4 @@ -# include_next.m4 serial 22 +# include_next.m4 serial 23 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -219,12 +219,17 @@ changequote(,) gl_dirsep_regex='[/\\]' ;; *) - gl_dirsep_regex='/' + gl_dirsep_regex='\/' ;; esac + dnl A sed expression that turns a string into a basic regular + dnl expression, for use within "/.../". + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' changequote([,]) - gl_absolute_header_sed='\|'"${gl_dirsep_regex}"']m4_defn([gl_HEADER_NAME])[|{ - s|.*"\(.*'"${gl_dirsep_regex}"']m4_defn([gl_HEADER_NAME])[\)".*|\1| + gl_header_literal_regex=`echo ']m4_defn([gl_HEADER_NAME])[' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ changequote(,)dnl s|^/[^/]|//&| changequote([,])dnl |