From 7c2e81adf4195a7006bd3016ef4254e87b0e9888 Mon Sep 17 00:00:00 2001 From: Takahiro Ueda Date: Tue, 27 Jan 2026 14:51:42 +0900 Subject: [PATCH] build(configure): improve zlibWrapper handling outside Git work trees This avoids running git submodule when not in a Git working tree (which would otherwise result in a Git error) and provides a more helpful error message. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 768df67a..72a5941b 100644 --- a/configure.ac +++ b/configure.ac @@ -397,11 +397,11 @@ AM_CONDITIONAL([WITHZSTD], [test "x$with_zstd" = xyes]) # Ensure zstd/zlibWrapper AS_IF([test -f "$srcdir/extern/zstd/zlibWrapper/zstd_zlibwrapper.h"], [], [AC_PATH_PROG([GIT], [git]) - AS_IF([test -n "$GIT"], [(cd "$srcdir" && "$GIT" submodule update --init)])]) + AS_IF([test -n "$GIT" && (cd "$srcdir" && "$GIT" rev-parse --is-inside-work-tree >/dev/null 2>&1)], [(cd "$srcdir" && "$GIT" submodule update --init)])]) AS_IF([test -f "$srcdir/extern/zstd/zlibWrapper/zstd_zlibwrapper.h"], [], - [AS_IF([test -d "$srcdir/.git"], + [AS_IF([test -e "$srcdir/.git"], [AC_MSG_FAILURE([$srcdir/extern/zstd/zlibWrapper does not exist. Run git submodule update --init in the repository directory])], - [AC_MSG_FAILURE([$srcdir/extern/zstd/zlibWrapper does not exist])])]) + [AC_MSG_FAILURE([$srcdir/extern/zstd/zlibWrapper does not exist. Copy the zlibWrapper directory from upstream (https://github.com/facebook/zstd)])])]) # Check for flint AC_ARG_WITH([flint],