[Groff-commit] groff ChangeLog configure

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     06/08/19 11:28:25

Modified files:
        .              : ChangeLog configure 

Log message:
        * configure: Regenerated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.984&r2=1.985
http://cvs.savannah.gnu.org/viewcvs/groff/configure?cvsroot=groff&r1=1.78&r2=1.79

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -b -r1.984 -r1.985
--- ChangeLog   18 Aug 2006 20:00:41 -0000      1.984
+++ ChangeLog   19 Aug 2006 11:28:24 -0000      1.985
@@ -1,3 +1,7 @@
+2006-08-19  Werner LEMBERG  <address@hidden>
+
+       * configure: Regenerated.
+
 2006-08-18  Keith Marshall  <address@hidden>
 
        * m4/groff.m4 (GROFF_MAKEINFO): Correct `makeinfo version testing

Index: configure
===================================================================
RCS file: /cvsroot/groff/groff/configure,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- configure   28 Mar 2006 17:54:16 -0000      1.78
+++ configure   19 Aug 2006 11:28:24 -0000      1.79
@@ -5725,35 +5725,20 @@
      echo "$as_me:$LINENO: result: $makeinfo_version" >&5
 echo "${ECHO_T}$makeinfo_version" >&6
      # Consider only the first two numbers in version number string.
-     makeinfo_version_major=`echo $makeinfo_version \
-       | sed 's/^\([0-9]*\).*$/\1/'`
-     if test -z "$makeinfo_version_major"; then
-       makeinfo_version_major=0
-       makeinfo_version_minor=0
-     else
-       makeinfo_version_minor=`echo $makeinfo_version \
-        | sed 's/^[^.][^.]*\(.*\)$/\1/'`
-       # No minor version number at all?
-       if test -z "$makeinfo_version_minor"; then
-        makeinfo_version_minor=0
-       else
-        makeinfo_version_minor=`echo $makeinfo_version_minor \
-          | sed 's/\.\([0-9]*\).*$/\1/'`
-        if test -z "$makeinfo_version_minor"; then
-          makeinfo_version_minor=0
-        fi
-       fi
-     fi
-   fi
-   makeinfo_version_numeric=`expr $makeinfo_version_major '*' 1000 \
-                                 '+' $makeinfo_version_minor`
+     makeinfo_version_major=`IFS=.; set x $makeinfo_version; echo 0${2}`
+     makeinfo_version_minor=`IFS=.; set x $makeinfo_version; echo 0${3}`
+     makeinfo_version_numeric=`
+       expr ${makeinfo_version_major}000 \+ ${makeinfo_version_minor}`
    if test $makeinfo_version_numeric -lt 4008; then
      missing="\`makeinfo' is too old."
    fi
+   fi
 
    if test -n "$missing"; then
-     if test ! -f doc/groff.info \
-       || test ${srcdir}/doc/groff.texinfo -nt doc/groff.info; then
+     infofile=doc/groff.info
+     test -f ${infofile} || infofile=${srcdir}/${infofile}
+     if test ! -f ${infofile} \
+       || test ${srcdir}/doc/groff.texinfo -nt ${infofile}; then
        { { echo "$as_me:$LINENO: error: $missing
 Get the \`texinfo' package version 4.8 or newer." >&5
 echo "$as_me: error: $missing