diff options
author | Juergen Borleis <jbe@pengutronix.de> | 2019-01-08 08:47:37 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-01-12 10:17:07 +0100 |
commit | 1259c22c7d78dcd5602ad42ca2dfd33001e02f2f (patch) | |
tree | 5092b01269405d649c23cc1067fa4a816cda76d8 /patches/libpaper-1.1.24+nmu5 | |
parent | d7d7ca50cdc0e786bc84929231c2ff0ddde1e5fa (diff) | |
download | ptxdist-1259c22c7d78dcd5602ad42ca2dfd33001e02f2f.tar.gz ptxdist-1259c22c7d78dcd5602ad42ca2dfd33001e02f2f.tar.xz |
libpaper: Make the default paper configurable
For embedded systems it makes sense to be able to configure the default
paper name at build-time instead of run-time via environment variable.
The approach currently used in the rule file to configure the paper size
at build-time does not work, since using the environment variable
'PAPERSIZE' only works at run-time.
This change adds a new '--with-default-paper' configure switch, to be able to
overwrite the default 'letter' setting.
Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/libpaper-1.1.24+nmu5')
-rw-r--r-- | patches/libpaper-1.1.24+nmu5/0001-Make-the-default-paper-configurable.patch | 32 | ||||
-rw-r--r-- | patches/libpaper-1.1.24+nmu5/series | 4 |
2 files changed, 36 insertions, 0 deletions
diff --git a/patches/libpaper-1.1.24+nmu5/0001-Make-the-default-paper-configurable.patch b/patches/libpaper-1.1.24+nmu5/0001-Make-the-default-paper-configurable.patch new file mode 100644 index 000000000..aad9f5a80 --- /dev/null +++ b/patches/libpaper-1.1.24+nmu5/0001-Make-the-default-paper-configurable.patch @@ -0,0 +1,32 @@ +From: Juergen Borleis <juergen@kreuzholzen.de> +Date: Tue, 1 Jan 2019 22:12:43 +0100 +Subject: [PATCH] Make the default paper configurable + +For embedded systems it makes sense to be able to configure the default +paper name at build-time instead of run-time via environment variable. + +Signed-off-by: Juergen Borleis <juergen@kreuzholzen.de> +--- + configure.ac | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index b6e937163775..34342d1f9295 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,7 +30,14 @@ AC_SUBST(PAPERCONFVAR) + AH_TEMPLATE(PAPERCONFVAR, [Environment variable that overrides the default configuration file location]) + AC_DEFINE_UNQUOTED(PAPERCONFVAR, "$PAPERCONFVAR") + +-PAPERSIZE=letter ++AC_MSG_CHECKING([which paper format name is the default one]) ++AC_ARG_WITH([default-paper], ++ [AS_HELP_STRING([--with-default-paper=@<:@name@:>@], [build with default paper name @<:@default=letter@:>@])], ++ [], ++ [with_default_paper=letter]) ++AC_MSG_RESULT([${with_default_paper}]) ++ ++PAPERSIZE=${with_default_paper} + AC_SUBST(PAPERSIZE) + AH_TEMPLATE(PAPERSIZE, [Default paper size]) + AC_DEFINE_UNQUOTED(PAPERSIZE, "$PAPERSIZE") diff --git a/patches/libpaper-1.1.24+nmu5/series b/patches/libpaper-1.1.24+nmu5/series new file mode 100644 index 000000000..dcd68e553 --- /dev/null +++ b/patches/libpaper-1.1.24+nmu5/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Make-the-default-paper-configurable.patch +# e6daca9c3e99c1f166eba3ea6dc1961e - git-ptx-patches magic |