trans-coord/gnun/server/gnun ChangeLog configur...

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/11/27 22:50:47

Modified files:
        gnun/server/gnun: ChangeLog configure.ac 
        gnun/server/gnun/m4: check_gnu_make.m4 

Log message:
        * m4/check_gnu_make.m4: Require AC_PROG_GREP.  Fix some quotation
        and formatting problems.
        * configure.ac: Don't call AC_PROG_GREP.  Use the GREP variable
        for all tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?cvsroot=trans-coord&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/m4/check_gnu_make.m4?cvsroot=trans-coord&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- ChangeLog   27 Nov 2008 19:57:50 -0000      1.113
+++ ChangeLog   27 Nov 2008 22:50:47 -0000      1.114
@@ -1,3 +1,10 @@
+2008-11-28  Yavor Doganov  <address@hidden>
+
+       * m4/check_gnu_make.m4: Require AC_PROG_GREP.  Fix some quotation
+       and formatting problems.
+       * configure.ac: Don't call AC_PROG_GREP.  Use the GREP variable
+       for all tests.
+
 2008-11-27  Yavor Doganov  <address@hidden>
 
        * make-prototype.in (help-message): Use PACKAGE_BUGREPORT.

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- configure.ac        27 Nov 2008 19:57:51 -0000      1.4
+++ configure.ac        27 Nov 2008 22:50:47 -0000      1.5
@@ -43,7 +43,6 @@
 AC_ARG_VAR([SED], [the `sed' program])
 AC_PROG_SED
 AC_ARG_VAR([GREP], [the `grep' program])
-AC_PROG_GREP
 AC_ARG_VAR([EGREP], [the `egrep' program])
 AC_PROG_EGREP
 
@@ -74,7 +73,7 @@
 AC_CACHE_CHECK([if po4a is version 0.34], [gnun_cv_recent_po4a],
               [gnun_cv_recent_po4a=no
                if (sh -c "$PO4A_TRANSLATE --version" 2> /dev/null | \
-                   grep 0.34 2>&1 > /dev/null) ; then
+                   $GREP 0.34 2>&1 > /dev/null) ; then
                gnun_cv_recent_po4a=yes ;
                fi])
 fi
@@ -86,7 +85,7 @@
 AC_CACHE_CHECK([whether `mail' is from GNU Mailutils],
               [gnun_cv_gnu_mailutils],
               [gnun_cv_gnu_mailutils=no
-               if (sh -c "mail --version" 2> /dev/null | grep GNU \
+               if (sh -c "mail --version" 2> /dev/null | $GREP GNU \
                    2>&1 > /dev/null) ; then
                gnun_cv_gnu_mailutils=yes ;
                fi])

Index: m4/check_gnu_make.m4
===================================================================
RCS file: 
/sources/trans-coord/trans-coord/gnun/server/gnun/m4/check_gnu_make.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- m4/check_gnu_make.m4        2 Nov 2008 18:50:34 -0000       1.1
+++ m4/check_gnu_make.m4        27 Nov 2008 22:50:47 -0000      1.2
@@ -75,26 +75,25 @@
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved.
 
-AC_DEFUN([CHECK_GNU_MAKE], [
-       AC_CACHE_CHECK([for GNU make], [_cv_gnu_make_command],
-                _cv_gnu_make_command='' ;
-dnl Search all the common names for GNU make
+AC_DEFUN([CHECK_GNU_MAKE],
+[AC_REQUIRE([AC_PROG_GREP])dnl
+AC_CACHE_CHECK([for GNU make], [_cv_gnu_make_command],
+              [_cv_gnu_make_command=''
+              # Search all the common names for GNU make
                 for a in "$MAKE" make gmake gnumake ; do
                   if test -z "$a" ; then continue ; fi ;
-                    if ( sh -c "$a --version" 2> /dev/null | grep GNU  \
+                    if ( sh -c "$a --version" 2> /dev/null | $GREP GNU  \
                         2>&1 > /dev/null ) ;  then
                        _cv_gnu_make_command=$a ;
                        break;
                     fi
-                done ;
-        ) ;
-dnl If there was a GNU version, then set @ifGNUmake@ to the empty string,
-dnl '#' otherwise
-        if test  "x$_cv_gnu_make_command" != "x"  ; then
-                ifGNUmake='' ;
-        else
-                ifGNUmake='#' ;
-                AC_MSG_RESULT("Not found");
-        fi
-        AC_SUBST(ifGNUmake)
-] )
+                done
+               ])
+# If there was a GNU version, then set @ifGNUmake@ to the empty string.
+if test "x$_cv_gnu_make_command" != "x"  ; then
+  ifGNUmake=''
+else
+  ifGNUmake='#'
+fi
+AC_SUBST([ifGNUmake])
+])# CHECK_GNU_MAKE