From 83ee47d7690bc2037ec81eb650f53d5d624327f8 Mon Sep 17 00:00:00 2001
From: Johanna Amann <johanna@corelight.com>
Date: Tue, 2 Apr 2024 16:49:43 +0100
Subject: [PATCH] Address review feedback for configure error change

See GH-3669
---
 configure | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index f64b2938ec..15b8f666bf 100755
--- a/configure
+++ b/configure
@@ -133,8 +133,9 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
 
 sourcedir="$(cd "$(dirname "$0")" && pwd)"
 
-if [ ! -e "$sourcedir/cmake/COPYING" ] && [ -d "$sourcedir/.git" ]; then
-    echo "\
+if [ ! -e "$sourcedir/cmake/COPYING" ]; then
+    if [ -d "$sourcedir/.git" ]; then
+        echo "\
 You seem to be missing the content of the cmake directory.
 
 This typically means that you performed a non-recursive git clone of
@@ -142,11 +143,8 @@ Zeek. To check out the required subdirectories, please execute:
 
   ( cd $sourcedir && git submodule update --recursive --init )
 " >&2
-    exit 1
-fi
-
-if [ ! -e "$sourcedir/cmake/COPYING" ] && [ ! -d "$sourcedir/.git" ]; then
-    echo "\
+    else
+        echo "\
 You seem to be missing the content of the cmake directory.
 
 This typically means that you downloaded a non-release archive from github.
@@ -161,6 +159,7 @@ clone our repository.
 See https://docs.zeek.org/en/master/install.html#retrieving-the-sources for
 instructions.
 " >&2
+    fi
     exit 1
 fi