* added out-of-the-box support for future darwin releases. right now, the following...

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 42faefd6cf94c8ede9e4fe14e3b5d0bd20a8fa2f..8d0c7656e295298ca8e0bfdca040c5f52237d71b 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -134,6 +134,10 @@ case $HOST in
         ;;
 esac
 
+if test `uname -r` = "9.0.0d5"; then
+echo "HAVE_FUTURE_DARWIN_OS = 1" >> config.mak
+fi
+
 echo "BUILD = $BUILD" >> config.mak
 echo "HOST = $HOST" >> config.mak
 

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ba3027ea5bad82925dae8f8e9774446af9fd6b5a..28dbfe97876ce033249e29ac8a17eaa0f01bd7bf 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -144,13 +144,23 @@ endif
 # ***************************************************************************
 
 ifdef HAVE_DARWIN_OS
- all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
-       .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-       .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
-       .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
-       .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
-       .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca .tag .x264 .goom2k4
+  ifdef HAVE_FUTURE_DARWIN_OS
+     all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
+        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+        .FLAC .speex .shout .faad .faac .lame .ebml .matroska .ffmpeg \
+        .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
+        .png .gpg-error .gcrypt .gnutls .opendaap .SDL_image \
+        .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder \
+            .libdca .tag .goom2k4 .aclocal
+  else
+     all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
+        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+        .FLAC .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
+        .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
+        .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
+        .glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder \
+            .libdca .tag .x264 .goom2k4 .aclocal
+  endif
 # .expat .clinkcc don't work with SDK yet
 # .glib .libidl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package