diff options
| author | P. J. McDermott <pj@pehjota.net> | 2023-02-23 12:46:22 (EST) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2023-02-23 13:31:41 (EST) |
| commit | cb0dd73c639fcef0a1d2d73226bbec713afdd42f (patch) | |
| tree | 26ea7bce1fa08e3e5c6b06fd3a41741665d52258 /configure.ac | |
| parent | 367f73e6f93396e878781ffe7933e5107417a2a1 (diff) | |
| download | overworld-rpg-cb0dd73c639fcef0a1d2d73226bbec713afdd42f.zip overworld-rpg-cb0dd73c639fcef0a1d2d73226bbec713afdd42f.tar.gz overworld-rpg-cb0dd73c639fcef0a1d2d73226bbec713afdd42f.tar.bz2 | |
build: Distribute embedded xcf2png, use by default
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 42 |
1 files changed, 36 insertions, 6 deletions
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" |