[vlc-commits] contrib: make sure we can find autopoint later on when compiling on OSX

Felix Paul Kühne git at videolan.org
Tue Nov 29 20:16:40 CET 2011


vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Nov 29 20:16:33 2011 +0100| [7631d5ee5aea64e7cc03c3b0d94a36f37e0c3d15] | committer: Felix Paul Kühne

contrib: make sure we can find autopoint later on when compiling on OSX

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

 contrib/src/gcrypt/rules.mak |    2 +-
 contrib/src/main.mak         |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 72fde6b..d220654 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -24,6 +24,6 @@ CONFIGURE_OPTS += --disable-aesni-support
 endif
 .gcrypt: libgcrypt
 	#$(RECONF)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160,sha512 --enable-pubkey-ciphers=dsa,rsa,ecc $(CONFIGURE_OPTS)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-asm --enable-ciphers=aes,des,rfc2268,arcfour --enable-digests=sha1,md5,rmd160,sha512 --enable-pubkey-ciphers=dsa,rsa,ecc $(CONFIGURE_OPTS)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index eef0ac2..93ae71a 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -108,6 +108,7 @@ endif
 
 ifdef HAVE_MACOSX
 MACOSX_SDK=/Developer/SDKs/MacOSX$(OSX_VERSION).sdk
+PATH :=$(abspath ../../extras/tools/build/bin):$(abspath ../$(BUILD)/bin):$(PATH)
 CC=gcc-4.2
 CXX=g++-4.2
 AR=ar



More information about the vlc-commits mailing list