From cb0dd73c639fcef0a1d2d73226bbec713afdd42f Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Thu, 23 Feb 2023 12:46:22 -0500
Subject: build: Distribute embedded xcf2png, use by default

---
(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index b429be5..eb00278 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,13 +49,43 @@ PKG_CHECK_MODULES([LUA], [lua >= 5.1], [],
 		[PKG_CHECK_MODULES([LUA], [lua-5.1 >= 5.1])])
 	])
 
-AC_ARG_VAR([XCF2PNG], [path to xcf2png utility])
-AC_CHECK_PROGS([XCF2PNG], [xcf2png], [no])
-if test "x$XCF2PNG" = "xno"; then
-	AC_MSG_ERROR(
-[cannot find xcf2png
-xcftools may need to be installed.])
+dnl AC_ARG_VAR([XCF2PNG], [path to xcf2png utility])
+AC_ARG_WITH(
+	[system-xcf2png],
+	[AS_HELP_STRING([--with-system-xcf2png[=PATH]], [use system xcf2png])],
+	[
+		case "${withval}" in
+			'yes'|'')
+				AC_PATH_PROG([XCF2PNG], [xcf2png])
+				if test -z "${XCF2PNG}"; then
+					AC_MSG_ERROR([xcf2png not found])
+				fi
+				embedded_xcf2png=false
+				;;
+			'no')
+				embedded_xcf2png=true
+				;;
+			*)
+				XCF2PNG="${withval}"
+				AC_SUBST([XCF2PNG])
+				embedded_xcf2png=false
+				;;
+		esac
+	],
+	[
+		embedded_xcf2png=true
+	]
+)
+if ${embedded_xcf2png}; then
+	AS_MKDIR_P([3rdparty/xcftools])
+	XCF2PNG='3rdparty/xcftools/xcf2png$(EXEEXT)'
+	abs_srcdir="$(cd "${srcdir}" && pwd)"
+	(
+		cd 3rdparty/xcftools
+		"${SHELL}" "${abs_srcdir}/3rdparty/xcftools/configure"
+	)
 fi
+AM_CONDITIONAL([EMBEDDED_XCF2PNG], [${embedded_xcf2png}])
 
 if test "x$GCC" = "xyes"; then
 	GCC_CFLAGS="-pedantic -Wall -Wextra -Werror"
--
cgit v0.9.1