Re: [ptxdist] [PATCH] libpaper: Make the default paper configurable

[Roland Hieber <rhi@pengutronix.de>]

Hi Jürgen,

I would suggest --with-default-paper instead of --with-paper, see the
following fixup. Otherwise looks fine to me.

 - Roland

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
index 8a71f9009..bcc61dd23 100644
--- 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
@@ -11,7 +11,7 @@ Signed-off-by: Juergen Borleis <juergen@kreuzholzen.de>
  1 file changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index b6e937163775..b8744604629b 100644
+index 5451156fafb5..4f9c53df37eb 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -30,7 +30,14 @@ AC_SUBST(PAPERCONFVAR)
@@ -20,13 +20,13 @@ index b6e937163775..b8744604629b 100644
  
 -PAPERSIZE=letter
 +AC_MSG_CHECKING([which paper format name is the default one])
-+AC_ARG_WITH([paper],
-+	[AS_HELP_STRING([--with-paper=@<:@name@:>@], [build with default paper name @<:@default=letter@:>@])],
++AC_ARG_WITH([default-paper],
++	[AS_HELP_STRING([--with-default-paper=@<:@name@:>@], [build with default paper name @<:@default=letter@:>@])],
 +	[],
-+	[with_paper=letter])
-+AC_MSG_RESULT([${with_paper}])
++	[with_default_paper=letter])
++AC_MSG_RESULT([${with_default_paper}])
 +
-+PAPERSIZE=${with_paper}
++PAPERSIZE=${with_default_paper}
  AC_SUBST(PAPERSIZE)
  AH_TEMPLATE(PAPERSIZE, [Default paper size])
  AC_DEFINE_UNQUOTED(PAPERSIZE, "$PAPERSIZE")
diff --git a/rules/libpaper.make b/rules/libpaper.make
index 453a3aae1..45cd946cc 100644
--- a/rules/libpaper.make
+++ b/rules/libpaper.make
@@ -39,7 +39,7 @@ LIBPAPER_LICENSE_FILES	:= file://COPYING;md5=0278281246c1e59af1ef0ae1784a4948
 LIBPAPER_CONF_TOOL	:= autoconf
 LIBPAPER_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--with-paper=$(PTXCONF_LIBPAPER_SIZE)
+	--with-default-paper=$(PTXCONF_LIBPAPER_SIZE)
 
 #
 # ----------------------------------------------------------------------------


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de