Commit 475671ea authored by Sean McGovern's avatar Sean McGovern Committed by Jean-Baptiste Kempf

contrib/shout: disable openssl functionality

Signed-off-by: Jean-Baptiste Kempf's avatarJean-Baptiste Kempf <jb@videolan.org>
parent ff403e89
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.])
......@@ -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 $@
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment