f70a50423f
This will fix static build of libshout in version 2.4.5 with openssl
(tools were added by
34a535bdbb)
Fixes:
- http://autobuild.buildroot.net/results/a6b/a6b7df5d4b4bccbfe54f3173365e88d849ed0e30/
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
52 lines
1.4 KiB
Diff
52 lines
1.4 KiB
Diff
From 148b56bf894192cef6dd133715e295260b934a71 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Fri, 5 Mar 2021 15:50:32 +0100
|
|
Subject: [PATCH] configure.ac: add an option to disable tools
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status:
|
|
https://gitlab.xiph.org/xiph/icecast-libshout/-/issues/2331]
|
|
---
|
|
Makefile.am | 5 ++++-
|
|
configure.ac | 5 +++++
|
|
2 files changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index ea855cf..79241f1 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -3,10 +3,13 @@
|
|
AUTOMAKE_OPTIONS = 1.6 foreign
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
|
|
-SUBDIRS = include src doc win32 tools
|
|
+SUBDIRS = include src doc win32
|
|
if HAVE_EXAMPLES
|
|
SUBDIRS += examples
|
|
endif
|
|
+if HAVE_TOOLS
|
|
+SUBDIRS += tools
|
|
+endif
|
|
|
|
EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
|
|
m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 264b9b0..34f971c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -100,6 +100,11 @@ AC_ARG_ENABLE([examples],
|
|
AS_HELP_STRING([--disable-examples],[Do not build example code]))
|
|
AM_CONDITIONAL([HAVE_EXAMPLES],[test "${enable_examples}" != "no"])
|
|
|
|
+dnl Allow tools not to be build
|
|
+AC_ARG_ENABLE([tools],
|
|
+ AS_HELP_STRING([--disable-tools],[Do not build tools]))
|
|
+AM_CONDITIONAL([HAVE_TOOLS],[test "${enable_tools}" != "no"])
|
|
+
|
|
dnl Module checks
|
|
XIPH_NET
|
|
|
|
--
|
|
2.30.0
|
|
|