Backport contrib changes from trunk.

extras/contrib/bootstrap

@@ -22,9 +22,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 # ***************************************************************************
 
-if test "$#" -gt "1"; then
-  echo "Usage: $0 <host>" >&2
-  echo "  Prepare config.mak file." >&2
+if test "$#" -gt "2" -o "$1" = "-h" -o "$1" = "--help" ; then
+  echo "Usage: $0 [host [distro]]" >&2
+  echo "  Prepare config.mak and distro.mak file." >&2
   exit 1
 fi
 
@@ -40,12 +40,25 @@ else
   HOST="$BUILD"
 fi
 
+DISTRO=
+if test "$#" = "2"; then
+    echo "Forcing distro.mak to use $2.mak"
+    DISTRO="$2"
+    HOST="$1"
+fi
+
 rm -f config.mak
 {
     echo "# Automatically generated by bootstrap."
     echo "# Make changes if you know what you're doing."
 } > config.mak
 
+rm -f distro.mak
+{
+    echo "# Automatically generated by bootstrap"
+    echo "# Make changes if you know what you're doing."
+} > distro.mak
+
 if test "$HOST" != "$BUILD"; then
     CC="${HOST}-gcc"
     CXX="${HOST}-g++"
@@ -141,6 +154,19 @@ case $HOST in
                         echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
                     fi
                 fi
+                # Try to match distribution
+                if test -f /etc/fedora-release; then
+                    cat src/Distributions/fedora.mak >> distro.mak
+                else
+                    # Default Unix-like systems
+                    cat src/Distributions/unix.mak >> distro.mak
+                fi
+            else # unknown distro
+                if test ! -z "${DISTRO}";  then
+                    cat src/Distributions/${DISTRO}.mak >> distro.mak
+                else
+                    cat src/Distributions/unix.mak >> distro.mak
+                fi
             fi
         ;;
 esac

extras/contrib/src/Distributions/beos.mak

+# Beos Rules
+ifeq ($(HOST),$(BUILD))
+# Native build: we need perl, autoconf, etc first
+all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
+	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+	.dvdnav .dvbpsi .dca .aclocal
+   #.speex seems
+else
+# Cross compiling: we already have the Linux tools, only build the
+# libraries now
+all: .iconv .intl .freetype .fribidi \
+	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+	.flac .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
+	.dvdnav .dvbpsi .dca .aclocal
+endif
+#.speex

extras/contrib/src/Distributions/darwin.mak

+# Darwin rules
+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 .gecko .mpcdec .dirac_encoder .dirac_decoder \
+    .dca .tag .x264 .goom2k4 .lua .zvbi .fontconfig .ncurses .aclocal
+# .expat .clinkcc don't work with SDK yet
+# .glib .IDL .gecko are required to build the mozilla plugin
+# .mozilla-macosx will build an entire mozilla. it can be used if we need to create a new .gecko package
+

extras/contrib/src/Distributions/debian.mak

+# Debian Linux
+all: .iconv .intl .freetype .fribidi .zlib \
+	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.png .gpg-error .gcrypt .gnutls .mpcdec \
+	.dvdnav .dvbpsi .wxwidgets .dirac \
+	.dca .raw1394 .dc1394 .lua .zvbi \
+	.aclocal 
+#	.SDL_image  .daap .cddb .cdio .vcdimager
+

extras/contrib/src/Distributions/fedora.mak

+# Fedora Linux rules
+all: .intl .freetype .fribidi .zlib \
+	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.mpcdec \
+	.dvdnav .dvbpsi .wxwidgets .dirac \
+	.dca .raw1394 .dc1394 .lua .zvbi \
+	.aclocal
+

extras/contrib/src/Distributions/netbox3.mak

+# NetBOX Linux rules
+all: .iconv .intl .freetype .zlib \
+	.mpeg2 .faad .ffmpeg .live .xml \
+	.dvbpsi
+

extras/contrib/src/Distributions/unix.mak

+# Standard Linux or other UNIX-like systems
+all: .iconv .intl .freetype .fribidi .zlib \
+	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+	.live .goom2k4 .caca .mod .x264  .xml .twolame \
+	.png .gpg-error .gcrypt .gnutls .mpcdec \
+	.dvdnav .dvbpsi .wxwidgets .dirac \
+	.dca .raw1394 .dc1394 .lua .zvbi \
+	.aclocal
+#	.png .gpg-error .gcrypt .gnutls .mpcdec \
+#	.SDL_image  .daap .cddb .cdio .vcdimager
+

extras/contrib/src/Distributions/win32.mak

+# WIN32 rules
+all: .iconv .intl .freetype .fribidi .zlib \
+        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
+        .flac .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
+        .live .goom2k4 .caca .mod .x264  .xml .twolame \
+        .png .gpg-error .gcrypt .gnutls .mpcdec \
+        .dvdnav .dvbpsi .wxwidgets .qt4 .dirac .SDL_image \
+        .dx_headers .dshow_headers .gecko-win32 .unicows .dca \
+        .lua .tag .fontconfig \
+        .aclocal
+#       .daap .cddb .cdio .vcdimager .portaudio

extras/contrib/src/Distributions/wince.mak

+# WinCE rules
+all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad
+

extras/contrib/src/Makefile

@@ -135,72 +135,7 @@ endif
 # Standard rules
 # ***************************************************************************
 
-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 .x264 .caca .mod \
-	.png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager .SDL_image \
-	.glib .libidl .gecko .mpcdec .dirac_encoder .dirac_decoder .aclocal \
-        .libdca .goom2k4 .x264 .zvbi
-# .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
-# 
-# Things only enabled on PPC
-ifneq ($(HOST),i686-apple-darwin8)
-all:
-endif
-else
-
- ifdef HAVE_BEOS
-  ifeq ($(HOST),$(BUILD))
-# Native build: we need perl, autoconf, etc first
-   all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
-	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
-	.dvdnav .dvbpsi .aclocal .libdca
-  else
-# Cross compiling: we already have the Linux tools, only build the
-# libraries now
-   all: .iconv .intl .freetype .fribidi \
-	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-	.FLAC .speex .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
-	.dvdnav .dvbpsi .aclocal .libdca
-  endif
- else
-
-  ifdef HAVE_WIN32
-
-   all: .iconv .intl .freetype .fribidi .zlib \
-	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
-	.FLAC .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264  .xml .twolame \
-	.png .gpg-error .gcrypt .gnutls .mpcdec \
-	.dvdnav .dvbpsi .wxwidgets .dirac .SDL_image \
-	.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
-#	.daap .cddb .cdio .vcdimager .portaudio 
-  else
-
-   ifdef HAVE_WINCE
-
-   all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad
-
-   else
-# Standard Linux or other UNIX-like systems
-   all:  \
-	.a52 .mpeg2 .id3tag .mad \
-	.FLAC .speex .faad .faac .lame .libamrnb .libamrwb .ffmpeg .dvdcss \
-	.live .goom2k4 .caca .mod .x264 .xml .twolame \
-	.mpcdec \
-	.dvdnav .dvbpsi .dirac \
-	.aclocal .zvbi .libdca .libdc1394
-#	.png .gpg-error .gcrypt .gnutls .mpcdec\
-#	.SDL_image  .daap .cddb .cdio .vcdimager 
-   endif
-  endif
- endif
-endif
+include ../distro.mak
 
 FORCE: