gnucash-docs maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-docs/commit/a45b18d3 (commit)
	 via  https://github.com/Gnucash/gnucash-docs/commit/dda9f975 (commit)
	from  https://github.com/Gnucash/gnucash-docs/commit/ec0063d1 (commit)



commit a45b18d30c363cfec43f82cb7bb6cc74181285a1
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jan 1 12:22:39 2016 -0800

    Use letter size paper only in US or C locales.
    
    The rest of the world uses metric A4 paper. The locale detection is done
    at configure.

diff --git a/configure.ac b/configure.ac
index 1e4bf57..959a540 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,7 +181,15 @@ if test "x$with_mobi" = "xyes"; then
 else
   AC_MSG_NOTICE([Didn't make mobi target.  If you need, specify --with-mobi])
 fi
-
+if test -z $LANG; then LANG="C"; fi
+case $LANG in
+     *_US*|C)
+        lang_us=true ;;
+     *)
+        lang_us=false ;;
+esac
+
+AM_CONDITIONAL([LANG_US], [test x${lang_us} = "xtrue"])
 AC_CONFIG_FILES([
 gnucash-docs.spec
 help/Makefile
diff --git a/guide/C/Makefile.am b/guide/C/Makefile.am
index b054d19..1f6e0b5 100644
--- a/guide/C/Makefile.am
+++ b/guide/C/Makefile.am
@@ -1,3 +1,9 @@
+if LANG_US
+XSLTFLAGS_FO = --stringparam paper.type letter
+else
+XSLTFLAGS_FO = --stringparam paper.type A4
+endif
+
 figdir = figures
 docname = gnucash-guide
 lang = C
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index 8eec921..2ac8626 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -1,3 +1,9 @@
+if LANG_US
+XSLTFLAGS_FO = --stringparam paper.type letter
+else
+XSLTFLAGS_FO = --stringparam paper.type A4
+endif
+
 figdir = figures
 docname = gnucash-help
 lang = C

commit dda9f9759710cb90434e867abb31d49cf4dac5f2
Author: John Ralls <jralls at ceridwen.us>
Date:   Fri Jan 1 12:21:08 2016 -0800

    Bug 760016 - 2.6.10 and master dump script error while running configure
    
    This was dumping in bash, too, if fop wasn't installed.

diff --git a/configure.ac b/configure.ac
index 7ef9429..1e4bf57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,7 @@ dnl
 dnl Check for optional fop
 dnl
 AC_PATH_PROG(FOP, fop)
+fop_version=0
 if test -z "$FOP"; then
   AC_MSG_WARN([fop not found. You will not be able to generate PDF files.])
 else
@@ -141,7 +142,7 @@ dnl Japanese fonts search path (Ubuntu, RedHat, openSUSE:local, Fedora)
 fi
 JAPANESE_MINCHO_METRIC=
 JAPANESE_GOTHIC_METRIC=
-if [[ $fop_version -lt 2 ]]; then
+if test $fop_version -gt 0 && test $fop_version -lt 2; then
    echo Mincho Metric: $japanese_mincho_metric
    	if test "x$japanese_mincho_metric" != "x"; then
 	   AC_CONFIG_COMMANDS([mincho_metric],



Summary of changes:
 configure.ac        | 13 +++++++++++--
 guide/C/Makefile.am |  6 ++++++
 help/C/Makefile.am  |  6 ++++++
 3 files changed, 23 insertions(+), 2 deletions(-)