Fix MacOS-Intel compilation

extras/contrib/src/Makefile

@@ -911,7 +911,7 @@ libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 endif
 
 .dvdcss: libdvdcss
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --disable-doc --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1459,7 +1459,7 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2
 ifdef HAVE_WIN32
 	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --target=i586-mingw32msvc --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; ./autogen.sh && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && make && make install)
 endif
 	$(INSTALL_NAME)
 	touch $@
@@ -1483,7 +1483,7 @@ gnutls: gnutls-$(GNUTLS_VERSION).tar.bz2
 ifdef HAVE_WIN32
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" --target=i586-mingw32msvc && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 else
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd crypto && make && cd ../gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="$(CFLAGS)" && cd gl && make &&  cd ../lib &&make && make install && cd ../includes && make install)
 endif
 	$(INSTALL_NAME)
 	touch $@

extras/contrib/src/packages.mak

@@ -34,7 +34,7 @@ AUTOCONF_VERSION=2.59
 AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
 LIBTOOL_VERSION=1.5.6
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
-AUTOMAKE_VERSION=1.7.8
+AUTOMAKE_VERSION=1.9.6
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 PKGCFG_VERSION=0.15.0
 PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkgconfig-$(PKGCFG_VERSION).tar.gz
@@ -160,8 +160,12 @@ PORTAUDIO_VERSION=19
 PORTAUDIO_URL=http://www.portaudio.com/archives/pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 CLINKCC_VERSION=171
 CLINKCC_URL=$(SF)/clinkcc/clinkcc$(CLINKCC_VERSION).tar.gz
+UPNP_VERSION=1.2.1
+UPNP_URL=$(SF)/upnp/libupnp-$(UPNP_VERSION).tar.gz
 EXPAT_VERSION=1.95.8
 EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
 NASM_CVSROOT=:pserver:anonymous@cvs.sourceforge.net:/cvsroot/nasm
 NASM_VERSION=0.98.40-20060130
 NASM_URL=$(VIDEOLAN)/testing/contrib/nasm-0.98.40-20060130.tar.bz2
+PTHREADS_VERSION=2-7-0
+PTHREADS_URL=ftp://sources.redhat.com/pub/pthreads-win32/pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz