[gimp-help-2] [make] Re-arrange a few make variables

[Ulf-D. Ehlert <ulfehlert src gnome org>]

commit a37148f21bd6d727e943b3223b625ccbdad6c704
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Thu Jun 14 20:21:30 2012 +0200

    [make] Re-arrange a few make variables
    
    ... to pass them through to quickreference/Makefile.

 Makefile.am  |   43 ++++++++++++++++---------------------------
 configure.ac |   18 +++++++++++++++++-
 2 files changed, 33 insertions(+), 28 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0f3fd10..3c22a71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,37 +30,26 @@ DOC_LINGUAS = $(LINGUAS)
 ####            External programs                                   ####
 ########################################################################
 
-## Essential external programs and their default options
-## (some of these variables are provided via "configure" -- see configure.ac)
+## Essential external programs and their default options:
 ##
-## XSLTPROC  = xsltproc
-## XSLTFLAGS = --nonet
+## (the following variables are provided via "configure";
+## edit configure.ac to change their default values)
+##
+## XSLTPROC, XSLTFLAGS
+## XMLLINT, XMLLINTFLAGS
+## XML2PO, XML2POFLAGS
+## MSGWIDTH
+## MSGUNIQ. MSGUNIQFLAGS
+## MSGCAT, MSGCATFLAGS
+## MSGINIT, MSGINITFLAGS
+## MSGFMT, MSGFMTFLAGS
+## MSGMERGE, MSGMERGEFLAGS
+## DBLATEX, DBLATEXFLAGS
+## DOCBOOK2ODF, DOCBOOK2ODFFLAGS
+
 # HIDE FROM AUTOMAKE #ifneq ($(srcdir),$(builddir))
 # HIDE FROM AUTOMAKE #XSLTFLAGS += --path $(builddir)
 # HIDE FROM AUTOMAKE #endif
-##
-## XMLLINT      = xmllint
-XMLLINTFLAGS = --nonet
-##
-## XML2PO        = $(srcdir)/tools/xml2po.py
-## XML2POFLAGS   = --mode=gimphelp
-##
-MSGWIDTH      = 79
-## MSGUNIQ       = msguniq
-MSGUNIQFLAGS  =
-## MSGCAT        = msgcat
-MSGCATFLAGS   = --width=$(MSGWIDTH)
-## MSGINIT       = msginit
-MSGINITFLAGS  = --no-translator --width=$(MSGWIDTH)
-## MSGFMT        = msgfmt
-## MSGFMTFLAGS   = --check --use-fuzzy --statistics
-## MSGMERGE      = msgmerge
-MSGMERGEFLAGS = --quiet --width=$(MSGWIDTH)
-##
-## DBLATEX       = dblatex
-DBLATEXFLAGS     = --backend=xetex --style=db2latex --verbose
-## DOCBOOK2ODF      = docbook2odf
-DOCBOOK2ODFFLAGS =
 
 # Standard shell commands
 find_l = find -L
diff --git a/configure.ac b/configure.ac
index 4eef73b..af0f654 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,8 @@ if test -z "$XMLLINT" && test "x$enable_build" = "xyes"; then
 fi
 
 AM_CONDITIONAL(HAVE_XMLLINT, test -n "$XMLLINT")
+XMLLINTFLAGS="--nonet"
+AC_SUBST(XMLLINTFLAGS)
 
 
 #  Search for dblatex
@@ -130,6 +132,8 @@ if test -z "$DBLATEX"; then
 fi
 
 AM_CONDITIONAL(HAVE_DBLATEX, test -n "$DBLATEX")
+DBLATEXFLAGS="--backend=xetex --style=db2latex --verbose"
+AC_SUBST(DBLATEXFLAGS)
 
 
 #  Search for docbook2odf
@@ -140,6 +144,8 @@ if test -z "$DOCBOOK2ODF"; then
 fi
 
 AM_CONDITIONAL(HAVE_DOCBOOK2ODF, test -n "$DOCBOOK2ODF")
+DOCBOOK2ODFFLAGS=
+AC_SUBST(DOCBOOK2ODFFLAGS)
 
 
 #  Use our customized xml2po
@@ -158,7 +164,6 @@ if test -z "$MSGFMT" && test "x$enable_i18n" = "xyes"; then
   AC_MSG_WARN([cannot find msgfmt])
   missing_i18n_tools=${missing_i18n_tools:+"${missing_i18n_tools} "}msgfmt
 fi
-
 MSGFMTFLAGS="--check --use-fuzzy --statistics"
 AC_SUBST(MSGFMTFLAGS)
 
@@ -167,24 +172,35 @@ AC_PATH_PROG(MSGINIT, msginit)
 if test -z "$MSGINIT" && test "x$enable_i18n" = "xyes"; then
   missing_i18n_tools=${missing_i18n_tools:+"${missing_i18n_tools} "}msginit
 fi
+MSGINITFLAGS='--no-translator --width=$(MSGWIDTH)'
+AC_SUBST(MSGINITFLAGS)
 
 
 AC_PATH_PROG(MSGMERGE, msgmerge)
 if test -z "$MSGMERGE" && test "x$enable_i18n" = "xyes"; then
   missing_i18n_tools=${missing_i18n_tools:+"${missing_i18n_tools} "}msgmerge
 fi
+MSGMERGEFLAGS='--quiet --width=$(MSGWIDTH)'
+AC_SUBST(MSGMERGEFLAGS)
 
 
 AC_PATH_PROG(MSGUNIQ, msguniq)
 if test -z "$MSGUNIQ" && test "x$enable_i18n" = "xyes"; then
   missing_i18n_tools=${missing_i18n_tools:+"${missing_i18n_tools} "}msguniq
 fi
+MSGUNIQFLAGS=
+AC_SUBST(MSGUNIQFLAGS)
 
 
 AC_PATH_PROG(MSGCAT, msgcat)
 if test -z "$MSGCAT" && test "x$enable_i18n" = "xyes"; then
   missing_i18n_tools=${missing_i18n_tools:+"${missing_i18n_tools} "}msgcat
 fi
+MSGCATFLAGS='--width=$(MSGWIDTH)'
+AC_SUBST(MSGCATFLAGS)
+
+MSGWIDTH=79
+AC_SUBST(MSGWIDTH)
 
 #  Optional: dot to create build system map