[Groff-commit] groff ChangeLog aclocal.m4 configure

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/12/12 07:14:59

Modified files:
        .              : ChangeLog aclocal.m4 configure 

Log message:
        * aclocal.m4 (GROFF_MAKEINFO): Fix regexps to be POSIX conformant.
        In particular, don't use `\+' since it is a GNU sed extension.
        
        * configure: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.869&tr2=1.870&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/aclocal.m4.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/configure.diff?tr1=1.71&tr2=1.72&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.869 groff/ChangeLog:1.870
--- groff/ChangeLog:1.869       Fri Dec  9 18:12:30 2005
+++ groff/ChangeLog     Mon Dec 12 07:14:59 2005
@@ -1,3 +1,10 @@
+2005-12-12  Werner LEMBERG  <address@hidden>
+
+       * 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  <address@hidden>
 
        * src/libs/libgroff/make-uniuni: New script to generate uniuni.cpp. 
Index: groff/aclocal.m4
diff -u groff/aclocal.m4:1.52 groff/aclocal.m4:1.53
--- groff/aclocal.m4:1.52       Fri Nov 18 21:12:56 2005
+++ groff/aclocal.m4    Mon Dec 12 07:14:59 2005
@@ -68,7 +68,7 @@
      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 @@
        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
Index: groff/configure
diff -u groff/configure:1.71 groff/configure:1.72
--- groff/configure:1.71        Fri Nov 18 21:12:56 2005
+++ groff/configure     Mon Dec 12 07:14:59 2005
@@ -5507,7 +5507,7 @@
 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 @@
        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