diff options
| author | wl <wl> | 2005-12-12 07:14:59 +0000 |
|---|---|---|
| committer | wl <wl> | 2005-12-12 07:14:59 +0000 |
| commit | 9e6a60bf918ba3640ec0ab0ad6d5d038539264e3 (patch) | |
| tree | 9cd16b8f0593a4e8652dd679c1affd40b3cc1098 | |
| parent | 6d3ccc9eb36f1a1beb99286cde0cab9503e5b1e0 (diff) | |
| download | groff-9e6a60bf918ba3640ec0ab0ad6d5d038539264e3.tar.gz | |
* aclocal.m4 (GROFF_MAKEINFO): Fix regexps to be POSIX conformant.
In particular, don't use `\+' since it is a GNU sed extension.
* configure: Regenerated.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | aclocal.m4 | 4 | ||||
| -rwxr-xr-x | configure | 4 |
3 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2005-12-12 Werner LEMBERG <wl@gnu.org> + + * aclocal.m4 (GROFF_MAKEINFO): Fix regexps to be POSIX conformant. + In particular, don't use `\+' since it is a GNU sed extension. + + * configure: Regenerated. + 2005-12-09 Werner LEMBERG <wl@gnu.org> * src/libs/libgroff/make-uniuni: New script to generate uniuni.cpp. @@ -68,7 +68,7 @@ AC_DEFUN([GROFF_MAKEINFO], AC_MSG_CHECKING([for makeinfo version]) # We need an additional level of quoting to make sed's regexps work. [makeinfo_version=`$MAKEINFO --version 2>&1 \ - | sed 's/^.* \([^ ]\+\)$/\1/;1q'`] + | sed -e 's/^.* \([^ ][^ ]*\)$/\1/' -e '1q'`] AC_MSG_RESULT([$makeinfo_version]) # Consider only the first two numbers in version number string. [makeinfo_version_major=`echo $makeinfo_version \ @@ -78,7 +78,7 @@ AC_DEFUN([GROFF_MAKEINFO], makeinfo_version_minor=0 else [makeinfo_version_minor=`echo $makeinfo_version \ - | sed 's/^[^.]\+\(.*\)$/\1/'`] + | sed 's/^[^.][^.]*\(.*\)$/\1/'`] # No minor version number at all? if test -z "$makeinfo_version_minor"; then makeinfo_version_minor=0 @@ -5507,7 +5507,7 @@ fi echo $ECHO_N "checking for makeinfo version... $ECHO_C" >&6 # We need an additional level of quoting to make sed's regexps work. makeinfo_version=`$MAKEINFO --version 2>&1 \ - | sed 's/^.* \([^ ]\+\)$/\1/;1q'` + | sed -e 's/^.* \([^ ][^ ]*\)$/\1/' -e '1q'` echo "$as_me:$LINENO: result: $makeinfo_version" >&5 echo "${ECHO_T}$makeinfo_version" >&6 # Consider only the first two numbers in version number string. @@ -5518,7 +5518,7 @@ echo "${ECHO_T}$makeinfo_version" >&6 makeinfo_version_minor=0 else makeinfo_version_minor=`echo $makeinfo_version \ - | sed 's/^[^.]\+\(.*\)$/\1/'` + | sed 's/^[^.][^.]*\(.*\)$/\1/'` # No minor version number at all? if test -z "$makeinfo_version_minor"; then makeinfo_version_minor=0 |