Removed --disable-audio-beos from ffmpeg configure line since it breaks non-beos...

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 02cacec214428970497ec4578887da3c928d6a35..6fbb304505211eafeec05a458093b45d6c3de1b8 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -2,7 +2,7 @@
 # ***************************************************************************
 # bootstrap : Set up config.mak
 # ***************************************************************************
-# Copyright (C) 2003 VideoLAN
+# Copyright (C) 2003 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -46,12 +46,27 @@ echo "BUILD = $BUILD" >> config.mak
 echo "HOST = $HOST" >> config.mak
 
 case $HOST in
-    powerpc-apple-darwin8 | ppc-darwin)
+    ppc-darwin)
+# Mac OS X < 10.4
            echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
-           echo "CONTRIB_URL = http://download.videolan.org/pub/videolan/devtools/contrib-macosx.tar.bz2" >> config.mak
+       ;;
+    powerpc-apple-darwin8)
+# Mac OS X 10.4
+# Makefile cross compiling is only supported with gcc-4.0
+# ENVP defines the oldest environment on which the program will be able to run
+# SDK 10.2.8 requires gcc-3.3 (so we cannot use that SDK)
+            echo "ENVP = MACOSX_DEPLOYMENT_TARGET=10.3" >> config.mak
+           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.0.sdk" >> config.mak
+#          echo "EXTRA_CFLAGS = -D\${ENVP} -isysroot \${MACOSX_SDK}" >> config.mak
+           echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
+#          echo "EXTRA_LDFLAGS = -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}" >> config.mak
         ;;
     i586-pc-beos)
-           echo "EXTRA_LDFLAGS = -lnet" >> config.mak
+            if test -f /boot/beos/system/lib/libbind.so; then
+                echo "EXTRA_LDFLAGS = -lbind -lsocket" >> config.mak
+            else
+                echo "EXTRA_LDFLAGS = -lnet" >> config.mak
+            fi
         ;;
     *)
         ;;