This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=3f1656e8a3231bc88ef4ea8e58f94972cbf2ebce commit 3f1656e8a3231bc88ef4ea8e58f94972cbf2ebce Author: Guillem Jover <[email protected]> AuthorDate: Mon Sep 25 18:34:59 2023 +0200 build: Remove dpkg prefix from default deb compressor configure knobs The prefix is not necessary and makes it a tad long, the option and macros are clear enough without them. --- configure.ac | 2 +- m4/dpkg-build.m4 | 14 +++++++------- src/deb/main.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index d1fa8357d..65cb131f3 100644 --- a/configure.ac +++ b/configure.ac @@ -285,7 +285,7 @@ Configuration: build shared libraries . . . : $enable_shared mmap loaders . . . . . . . . : $enable_mmap disk pre-allocation . . . . . : $enable_disk_preallocate - default dpkg-deb compressor . : $with_dpkg_deb_compressor + default dpkg-deb compressor . : $with_deb_compressor Paths: devlibdir . . . . . . . . . . : $devlibdir diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4 index cf4cf3a25..d815dd4ff 100644 --- a/m4/dpkg-build.m4 +++ b/m4/dpkg-build.m4 @@ -72,15 +72,15 @@ AC_DEFUN([DPKG_WITH_DIR], [ # ------------------- # Change default «dpkg-deb --build» compressor. AC_DEFUN([DPKG_DEB_COMPRESSOR], [ - AC_ARG_WITH([dpkg-deb-compressor], - [AS_HELP_STRING([--with-dpkg-deb-compressor=COMP], + AC_ARG_WITH([deb-compressor], + [AS_HELP_STRING([--with-deb-compressor=COMP], [change default dpkg-deb build compressor])], - [with_dpkg_deb_compressor=$withval], [with_dpkg_deb_compressor=$1]) - AS_CASE([$with_dpkg_deb_compressor], + [with_deb_compressor=$withval], [with_deb_compressor=$1]) + AS_CASE([$with_deb_compressor], [gzip|xz], [:], - [AC_MSG_ERROR([unsupported default compressor $with_dpkg_deb_compressor])]) - AC_DEFINE_UNQUOTED([DPKG_DEB_DEFAULT_COMPRESSOR], - [COMPRESSOR_TYPE_]AS_TR_CPP(${with_dpkg_deb_compressor}), + [AC_MSG_ERROR([unsupported default compressor $with_deb_compressor])]) + AC_DEFINE_UNQUOTED([DEB_DEFAULT_COMPRESSOR], + [COMPRESSOR_TYPE_]AS_TR_CPP(${with_deb_compressor}), [default dpkg-deb build compressor]) ]) # DPKG_DEB_COMPRESSOR diff --git a/src/deb/main.c b/src/deb/main.c index 490c5706c..7d08a670c 100644 --- a/src/deb/main.c +++ b/src/deb/main.c @@ -164,7 +164,7 @@ set_deb_format(const struct cmdinfo *cip, const char *value) } struct compress_params compress_params = { - .type = DPKG_DEB_DEFAULT_COMPRESSOR, + .type = DEB_DEFAULT_COMPRESSOR, .strategy = COMPRESSOR_STRATEGY_NONE, .level = -1, .threads_max = -1, -- Dpkg.Org's dpkg
