From: Jean-Baptiste Kempf <jb@altair.videolan.org>
Date: Sat, 8 Mar 2008 08:31:20 +0000 (+0100)
Subject: Remove more libgcrypt cipher/
X-Git-Tag: 0.9.0-test0~2268
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=797074b55c85d7d34af60b1e977bfe43dc26d7c3;p=vlc

Remove more libgcrypt cipher/
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index f368a95571..69a2300ac7 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1785,7 +1785,7 @@ libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $<; ./autogen.sh)
 endif
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls --disable-shared --disable-languages && make && make install)
 #	$(INSTALL_NAME)
 	touch $@
 
@@ -1806,7 +1806,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-ciphers=aes,des && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
+	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa && sed -i 46s@sys/times.h@sys/time.h@ cipher/random.c && make && make install)
 else
 ifdef HAVE_DARWIN_OS_ON_INTEL
 	(cd $<; $(HOSTCC) ./configure --host=$(HOST) --build=$(BUILD) --prefix=$(PREFIX) --disable-asm CFLAGS="$(CFLAGS)" && make && make install)