* patch libtwolame and re-enable x264 as it was fixed upstream. all contribs are...

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 965b4a921d6f5717530179fb2c87e3fce186af51..60480f2adb57d06f1d48df98491f719ac22064b4 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -41,7 +41,10 @@ else
 fi
 
 rm -f config.mak
-echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" > config.mak
+{
+       echo "# Automatically generated by bootstrap."
+       echo "# Make changes if you know what you're doing."
+} > config.mak
 
 if test "$HOST" != "$BUILD"; then
     CC="${HOST}-gcc"
@@ -54,9 +57,9 @@ fi
 case $HOST in
     ppc-darwin)
 # Mac OS X < 10.4
-           echo "HAVE_DARWIN_OS = 1" >> config.mak
-           EXTRA_CPPFLAGS=" -no-cpp-precomp"
-           echo "PATH = /bin:/usr/bin" >> config.mak
+           echo "Your version of Mac OS X is too old!" >&2
+           echo "Compiling VLC requires 10.4.x or later" >&2
+           exit 1
        ;;
     powerpc-apple-darwin8)
 # Mac OS X 10.4
@@ -69,19 +72,19 @@ case $HOST in
            echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
            echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
            CFLAGS_TUNING=" -mtune=G4"
-           #EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
-           #EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+           EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+           EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
            echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         ;;
     i686-apple-darwin8)
-           SDK_TARGET=10.3
+           SDK_TARGET=10.4
            echo "SDK_TARGET = ${SDK_TARGET}" >> config.mak
            echo "HAVE_DARWIN_OS = 1" >> config.mak
            echo "ENVP = MACOSX_DEPLOYMENT_TARGET=${SDK_TARGET}" >> config.mak
-           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.sdk" >> config.mak
+           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.4u.sdk" >> config.mak
            CFLAGS_TUNING=" -march=pentium-m -mtune=prescott"
-           #EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
-           #EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+           EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+           EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
            echo "PATH = /bin:/usr/bin:/usr/local/bin" >> config.mak
         ;;
     i586-pc-beos)