[vlc-commits] contrib/shout: disable openssl functionality

[Sean McGovern]

vlc/vlc-2.2 | branch: master | Sean McGovern <gseanmcg at gmail.com> | Sun Dec  6 22:56:30 2015 -0500| [f8c9253342bda0647658b63fb35312602f11ebe9] | committer: Jean-Baptiste Kempf

contrib/shout: disable openssl functionality

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit 475671ea0e382cdae9c13893012053d646c5c349)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=f8c9253342bda0647658b63fb35312602f11ebe9
---

 contrib/src/shout/fix-xiph_openssl.patch |   20 ++++++++++++++++++++
 contrib/src/shout/rules.mak              |    4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/contrib/src/shout/fix-xiph_openssl.patch b/contrib/src/shout/fix-xiph_openssl.patch
new file mode 100644
index 0000000..38e4c77
--- /dev/null
+++ b/contrib/src/shout/fix-xiph_openssl.patch
@@ -0,0 +1,20 @@
+diff --git a/m4/xiph_openssl.m4 b/m4/xiph_openssl.m4
+index f62a524..dcc8202 100644
+--- a/m4/xiph_openssl.m4
++++ b/m4/xiph_openssl.m4
+@@ -30,6 +30,7 @@ else
+ fi
+ 
+ # Now try linking to openssl
++if test x$with_openssl != xno; then
+ xt_save_CFLAGS="$CFLAGS"
+ xt_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+@@ -37,6 +38,7 @@ LIBS="$OPENSSL_LIBS $LIBS"
+ AC_TRY_LINK([#include <openssl/ssl.h>], [void *a = SSL_new], [openssl_ok='yes'])
+ CFLAGS="$xt_save_CFLAGS"
+ LIBS="$xt_save_LIBS"
++fi
+ 
+ if test "$openssl_ok" = "yes"; then
+     AC_DEFINE(HAVE_OPENSSL, 1, [Define if you have libopenssl.])
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 94f3861..c463962 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -22,6 +22,7 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
 	$(UNPACK)
 	$(APPLY) $(SRC)/shout/bsd.patch
 	$(APPLY) $(SRC)/shout/libshout-arpa.patch
+	$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
@@ -35,6 +36,7 @@ SHOUT_CONF += "--disable-thread"
 endif
 
 .shout: libshout
-	cd $< && $(HOSTVARS) ./configure $(SHOUT_CONF) $(HOSTCONF)
+	$(RECONF)
+	cd $< && $(HOSTVARS) ./configure --without-openssl $(SHOUT_CONF) $(HOSTCONF)
 	cd $< && $(MAKE) install
 	touch $@