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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   08/11/07 21:59:50

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile config.mk.in 
                          configure.ac 

Log message:
        * configure.ac: Check for egrep, needed for the `report' target,
        which is most likely to be used by the majority of translators.
        Use AC_CHECK_PROGS instead of AC_PATH_PROG(S); variables can still
        be overridden.
        * config.mk.in: Add @configure_input@ to give a hint that it is a
        generated file.
        (EGREP): New variable.
        * GNUmakefile (report): Use it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/config.mk.in?cvsroot=trans-coord&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/configure.ac?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.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- ChangeLog   6 Nov 2008 21:35:31 -0000       1.108
+++ ChangeLog   7 Nov 2008 21:59:50 -0000       1.109
@@ -1,3 +1,14 @@
+2008-11-07  Yavor Doganov  <address@hidden>
+
+       * configure.ac: Check for egrep, needed for the `report' target,
+       which is most likely to be used by the majority of translators.
+       Use AC_CHECK_PROGS instead of AC_PATH_PROG(S); variables can still
+       be overridden.
+       * config.mk.in: Add @configure_input@ to give a hint that it is a
+       generated file.
+       (EGREP): New variable.
+       * GNUmakefile (report): Use it.
+
 2008-11-06  Yavor Doganov  <address@hidden>
 
        * Makefile.am (noinst_SCRIPTS): Define to stamp-config.mk.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- GNUmakefile 2 Nov 2008 18:50:22 -0000       1.60
+++ GNUmakefile 7 Nov 2008 21:59:50 -0000       1.61
@@ -626,7 +626,7 @@
 endif
        @cd $(rootdir) ; LC_ALL=C find -name '*.$(TEAM).po' -printf "%p: " \
          -exec $(MSGFMT) --statistics -o /dev/null '{}' \; 2>&1 \
-           | sort | $(GREP) -E '(fuzzy|untranslated)' \
+           | sort | $(EGREP) '(fuzzy|untranslated)' \
          || echo "All translations seem to be up-to-date."
 
 # Special target to touch all the prerequisites of the targets that

Index: config.mk.in
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/config.mk.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- config.mk.in        2 Nov 2008 18:50:29 -0000       1.1
+++ config.mk.in        7 Nov 2008 21:59:50 -0000       1.2
@@ -1,7 +1,12 @@
+# @configure_input@
+
+# This variable is substituted via a Makefile rule.
 pkglibexecdir  := @pkglibexecdir@
+
 AWK            := @AWK@
 SED            := @SED@
 GREP           := @GREP@
+EGREP          := @EGREP@
 M4             := @M4@
 MSGFMT         := @MSGFMT@
 MSGMERGE       := @MSGMERGE@

Index: configure.ac
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- configure.ac        2 Nov 2008 18:50:31 -0000       1.1
+++ configure.ac        7 Nov 2008 21:59:50 -0000       1.2
@@ -30,18 +30,22 @@
 AM_INIT_AUTOMAKE
 
 # Checks for programs.  Missing some of them is not fatal, as the user
-# might want to use `make report' only.  For some programs
-# AC_PATH_PROG(S) is used in order to be possible to override the
-# location.
+# might want to use `make report' only, or some other limited
+# functionality.  Most variables are declared `precious' in order to
+# override them both via `configure' and `make' when building
+# translations.
 CHECK_GNU_MAKE
 
 AC_ARG_VAR([AWK], [the `awk' program])
 AX_CHECK_AWK_GSUB([decent_awk=yes])
+AC_SUBST([decent_awk])
 
 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' (`grep -E') program])
+AC_PROG_EGREP
 
 AC_ARG_VAR([M4], [the M4 macro processor command])
 AC_CACHE_CHECK([for m4 that expects arguments to the `format' builtin],
@@ -54,16 +58,16 @@
 AC_SUBST([M4], [$ac_cv_path_M4])
 
 AC_ARG_VAR([MSGFMT], [the `msgfmt' program])
-AC_PATH_PROGS([MSGFMT], [msgfmt gmsgfmt])
+AC_CHECK_PROGS([MSGFMT], [msgfmt gmsgfmt])
 AC_ARG_VAR([MSGMERGE], [the `msgmerge' program])
-AC_PATH_PROGS([MSGMERGE], [msgmerge gmsmerge])
+AC_CHECK_PROGS([MSGMERGE], [msgmerge gmsmerge])
 
 AC_CHECK_PROG([have_guile], [guile], [yes])
 
 AC_ARG_VAR([PO4A_GETTEXTIZE], [the `po4a-gettextize' program])
-AC_PATH_PROG([PO4A_GETTEXTIZE], [po4a-gettextize])
+AC_CHECK_PROGS([PO4A_GETTEXTIZE], [po4a-gettextize])
 AC_ARG_VAR([PO4A_TRANSLATE], [the `po4a-translate' program])
-AC_PATH_PROG([PO4A_TRANSLATE], [po4a-translate])
+AC_CHECK_PROGS([PO4A_TRANSLATE], [po4a-translate])
 
 # This is a weak test; should be replaced with a feature check.
 if test "$PO4A_TRANSLATE" != ""; then
@@ -88,7 +92,7 @@
                fi])
 fi
 AC_ARG_VAR([CVS], [the CVS client program])
-AC_PATH_PROG([CVS], [cvs])
+AC_CHECK_PROGS([CVS], [cvs])
 
 AC_CHECK_PROG([have_xmllint], [xmllint], [yes])
 if test "$have_xmllint" = yes; then
@@ -109,22 +113,22 @@
 if xmllint --valid --nonet --noout conftest.dtd 2> /dev/null ; then
   have_dtds=yes ;
 fi
-if test "$have_dtds" = no ; then
-AC_MSG_RESULT([$have_dtds (will use our copy)])
-else
-AC_MSG_RESULT([$have_dtds])
-fi
+  if test "$have_dtds" = no ; then
+    AC_MSG_RESULT([$have_dtds (will use our copy)])
+  else
+    AC_MSG_RESULT([$have_dtds])
+  fi
 fi
 
 AM_CONDITIONAL([NO_DTD], [test "$have_dtds" = no])
 
-AC_SUBST([decent_awk])
 AC_CONFIG_FILES([Makefile dtd/Makefile config.mk])
 AC_OUTPUT
 
+# FIXME: This is ugly, inefficient and not informative.
 echo
 if test "$ifGNUmake" = "" && test "$decent_awk" = yes \
-   && test "$SED" != "" && test "$GREP" != "" && test "$M4" != "" \
+   && test "$SED" != "" && test "$EGREP" != "" && test "$M4" != "" \
    && test "$MSGFMT" != "" && test "$MSGMERGE" != "" \
    && test "$have_guile" = yes && test "$gnun_cv_recent_po4a" = yes \
    && test "$have_mail" = yes && test "$CVS" != "" \