From: Vitalii Koshura <lestat.de.lionkur@gmail.com>
Date: Mon, 25 Dec 2023 11:38:24 +0000 (+0100)
Subject: Disable building quicserver utility when configured with `no-apps` option
X-Git-Tag: openssl-3.3.0-alpha1~375
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f60559eb957b53d7fd5c8c9ab566fe353ea2d9f8;p=thirdparty%2Fopenssl.git

Disable building quicserver utility when configured with `no-apps` option

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>

Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23149)
---

diff --git a/CHANGES.md b/CHANGES.md
index 6f7c66dbce5..43f874ff9c5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -28,6 +28,11 @@ OpenSSL 3.3
 
 ### Changes between 3.2 and 3.3 [xx XXX xxxx]
 
+ * Disable building QUIC server utility when OpenSSL is configured with
+   `no-apps`
+
+   *Vitalii Koshura*
+
  * The activate and soft_load configuration settings for providers in
    openssl.cnf have been updated to require a value of [1|yes|true|on]
    (in lower or UPPER case) to enable the setting. Conversely a value
diff --git a/util/build.info b/util/build.info
index cf06f15ae4f..e4aab44b380 100644
--- a/util/build.info
+++ b/util/build.info
@@ -6,9 +6,9 @@ SCRIPTS{noinst}=wrap.pl
 SOURCE[wrap.pl]=wrap.pl.in
 DEPEND[wrap.pl]=../configdata.pm
 
-IF[{- !$disabled{quic} && !$disabled{stdio} -}]
+IF[{- !$disabled{quic} && !$disabled{stdio} && !$disabled{apps} -}]
   PROGRAMS{noinst}=quicserver
   SOURCE[quicserver]=quicserver.c
-INCLUDE[quicserver]=../include ../apps/include
-DEPEND[quicserver]=../libcrypto.a ../libssl.a
+  INCLUDE[quicserver]=../include ../apps/include
+  DEPEND[quicserver]=../libcrypto.a ../libssl.a
 ENDIF