- contribs: misc fixes for cygwin mostly

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 95e70b4ea21fc788a3e04014794a8ae628184f7b..62678cb7b327780cbc8e281ed47fdee00bd6d718 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -2,10 +2,12 @@
 # ***************************************************************************
 # bootstrap : Set up config.mak
 # ***************************************************************************
-# Copyright (C) 2003-2006 the VideoLAN team
+# Copyright (C) 2003-2007 the VideoLAN team
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
+#          Derk-Jan Hartman <hartman at videolan dot org>
+#          Felix Kühne <fkuehne@users.sourceforge.net>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -41,7 +43,16 @@ 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
+
+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"
@@ -54,9 +65,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
@@ -68,21 +79,23 @@ case $HOST in
            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
-           CFLAGS_TUNING=" -mtune=G4"
-           #EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
-           #EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+           CFLAGS_TUNING=" -arch ppc -mtune=G4"
+           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
+        cat src/Distributions/darwin.mak >> distro.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
+        cat src/Distributions/darwin.mak >> distro.mak
         ;;
     i586-pc-beos)
             echo "HAVE_BEOS = 1" >> config.mak
@@ -107,13 +120,16 @@ case $HOST in
                 PATH="${PATH}:/usr/bin:/bin"
                 echo "PATH = ${PATH}" >> config.mak
             fi
+            cat src/Distributions/beos.mak >> distro.mak
         ;;
-    i586-mingw32msvc)
+    *mingw32*)
             echo "HAVE_WIN32 = 1" >> config.mak
             echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+            cat src/Distributions/win32.mak >> distro.mak
         ;;
     i686-pc-cygwin)
             echo "HAVE_WIN32 = 1" >> config.mak
+            echo "HAVE_CYGWIN = 1" >> config.mak
             CC="gcc -mno-cygwin -isystem /usr/include/mingw"
             CXX="g++ -mno-cygwin -isystem /usr/include/mingw"
             HOST=`$CC -dumpmachine`
@@ -121,13 +137,32 @@ case $HOST in
             EXTRA_CPPFLAGS=" -mno-cygwin -isystem /usr/include/mingw"
             EXTRA_LDFLAGS=" -mno-cygwin"
             echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+            cat src/Distributions/win32.mak >> distro.mak
         ;;
     arm-wince-pe)
             echo "HAVE_WINCE = 1" >> config.mak
             echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
             EXTRA_CPPFLAGS=" -D_WIN32_WCE"
+            cat src/Distributions/wince.mak >> distro.mak
         ;;
     *)
+            if test "$HOST" = "$BUILD"; then
+               if test -d "/usr/lib/pkgconfig"; then
+                   if test -z "$PKG_CONFIG_PATH"; then
+                       echo "PKG_CONFIG_PATH = /usr/lib/pkgconfig" >> config.mak
+                   fi
+                   if test -z "$PKG_CONFIG_LIBDIR"; then
+                       echo "PKG_CONFIG_LIBDIR = /usr/lib/pkgconfig" >> config.mak
+                   fi
+               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
         ;;
 esac
 
@@ -159,6 +194,8 @@ if test -f /sw/bin/svn; then
         echo "SVN = /sw/bin/svn" >> config.mak
 elif test -f /usr/local/bin/svn; then
         echo "SVN = /usr/local/bin/svn" >> config.mak
+elif test -f /usr/bin/svn; then
+       echo "SVN = /usr/bin/svn" >> config.mak
 elif test -f /opt/local/bin/svn; then
        echo "SVN = /opt/local/bin/svn" >> config.mak
 elif svn help >/dev/null 2>&1; then