[vlc-commits] contribs win64: fix libgcrypt linking

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Sep 23 02:36:02 2011 -0400| [fd7e51abf31fb4110da20d93b576f9f535dc0bc6] | committer: Rafaël Carré

contribs win64: fix libgcrypt linking

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

 contrib/src/gcrypt/rules.mak       |    5 ++++-
 extras/contrib/src/contrib-src.mak |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 1b0e12c..90f2c5c 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -16,8 +16,11 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 
 DEPS_gcrypt = gpg-error
 
+ifdef HAVE_WIN64
+ac_cv_sys_symbol_underscore=no
+endif
 .gcrypt: libgcrypt
 	#$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-pubkey-ciphers=dsa
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-pubkey-ciphers=dsa ac_cv_sys_symbol_underscore=$(ac_cv_sys_symbol_underscore)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index ffa72ca..7957793 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1852,9 +1852,12 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 
 CIPHDIG= --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160 --enable-publickey-digests=dsa
 
+ifdef HAVE_WIN64
+ac_cv_sys_symbol_underscore=no
+endif
 .gcrypt: libgcrypt .gpg-error
 ifdef HAVE_WIN32
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" $(CIPHDIG) --disable-shared --enable-static --disable-nls ac_cv_sys_symbol_underscore=$(ac_cv_sys_symbol_underscore) && make && make install)
 else
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS) -lgpg-error" $(CIPHDIG) && make && make install)
 endif