From: Alan Third <alan@idiocy.org>
Date: Sat, 26 Jun 2021 11:46:43 +0000 (+0100)
Subject: Fix NS self-contained build configuration
X-Git-Tag: emacs-28.0.90~2023
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ecf7e8b20ea095bd1232175160c3521ee299c069;p=emacs.git

Fix NS self-contained build configuration

* configure.ac: When rebuilding epaths.h for NS check that we're
actually doing an NS build first.
---

diff --git a/configure.ac b/configure.ac
index 92527056b95..c8920d877e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6020,12 +6020,12 @@ dnl the use of force in the 'epaths-force' rule in Makefile.in.
 AC_CONFIG_COMMANDS([src/epaths.h], [
 if test "${opsys}" = "mingw32"; then
   ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32
-elif test "$EN_NS_SELF_CONTAINED" = "yes"; then
+elif test "$HAVE_NS" = "yes" && test "$EN_NS_SELF_CONTAINED" = "yes"; then
   ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-ns-self-contained
 else
   ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force
 fi || AC_MSG_ERROR(['src/epaths.h' could not be made.])
-], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"
+], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys" HAVE_NS="$HAVE_NS"
     EN_NS_SELF_CONTAINED="$EN_NS_SELF_CONTAINED"])
 
 dnl NB we have to cheat and use the ac_... version because abs_top_srcdir