From 11d5dce3183d1af37dc4ea5c42df975a76603cc4 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Thu, 30 Nov 2023 23:07:04 -0500 Subject: [PATCH] Replace gnulib patch with new common helper macro. Using the new DX_PATCH_GNULIB macro allows m4 to implement the conditional dependency patches that were previously being done in bootstrap. --- bootstrap | 8 +------- common | 2 +- configure.ac | 2 ++ 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/bootstrap b/bootstrap index a58c083..defe0a7 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright © 2011-2012, 2021 Nick Bowler +# Copyright © 2011-2012, 2021, 2023 Nick Bowler # # Simple script to get started from a fresh git checkout. # @@ -48,12 +48,6 @@ fi $PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \ || die "Failed to fixup Gnulib makefile fragment." -# Rewrite if ! ... construts produced by gnulib conditional dependencies -# as these fail in heirloom-sh. -sed 's/if ! *\(.*gnulib_enabled[^;]*\); then/if \1; then :; else/' \ - m4/gnulib-comp.m4 >m4/gnulib-comp.m4.new || exit -mv -f m4/gnulib-comp.m4.new m4/gnulib-comp.m4 || exit - # Punt some automake-generated files so that Gentoo's wrapper script doesn't # try to detect the automake version in use. rm -f Makefile.in aclocal.m4 diff --git a/common b/common index 57a2e9b..1566158 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 57a2e9b84fe5ec89d919373dae66bb4924926d7a +Subproject commit 156615815cd9db9dfc55356939ec15d5d2ea5180 diff --git a/configure.ac b/configure.ac index 9ed1a99..98cc477 100644 --- a/configure.ac +++ b/configure.ac @@ -4,6 +4,8 @@ dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2. dnl This is free software: you are free to do what the fuck you want to. dnl There is NO WARRANTY, to the extent permitted by law. +DX_PATCH_GNULIB + AC_PREREQ([2.68]) AC_INIT([liblbx], [0.1], [nbowler@draconx.ca]) AC_CONFIG_SRCDIR([src/lbx.c]) -- 2.43.2