- contribs: misc fixes for cygwin mostly

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index a916b278a2920a08e9d7f3ae63a68e6a5f6840d6..62678cb7b327780cbc8e281ed47fdee00bd6d718 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -48,6 +48,12 @@ rm -f config.mak
        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++"
@@ -77,6 +83,7 @@ case $HOST in
            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.4
@@ -88,6 +95,7 @@ case $HOST in
            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
@@ -112,13 +120,16 @@ case $HOST in
                 PATH="${PATH}:/usr/bin:/bin"
                 echo "PATH = ${PATH}" >> config.mak
             fi
+            cat src/Distributions/beos.mak >> distro.mak
         ;;
     *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`
@@ -126,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