Fix some memleaks

[vlc] / extras / contrib / bootstrap

diff --git a/extras/contrib/bootstrap b/extras/contrib/bootstrap
index 216069b312f396761a48b0a2055894915d1431c4..c5230228a28dc4f53ccff4f48564039575d064c7 100755 (executable)
--- a/extras/contrib/bootstrap
+++ b/extras/contrib/bootstrap
@@ -19,7 +19,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 # ***************************************************************************
 
 if test "$#" -gt "1"; then
@@ -40,34 +40,98 @@ else
   HOST="$BUILD"
 fi
 
-echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" >| config.mak
+rm -f config.mak
+echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" > config.mak
 
 echo "BUILD = $BUILD" >> config.mak
 echo "HOST = $HOST" >> config.mak
 
+echo "PREFIX = `pwd`" >> config.mak
+
+if test "$HOST" != "$BUILD"; then
+    CC="${HOST}-gcc"
+    CXX="${HOST}-g++"
+    LD="${HOST}-ld"
+    RANLIB="${HOST}-ranlib"
+    AR="${HOST}-ar"
+fi
+
 case $HOST in
     ppc-darwin)
 # Mac OS X < 10.4
-           echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
+           echo "HAVE_DARWIN_OS = 1" >> config.mak
+           EXTRA_CPPFLAGS=" -no-cpp-precomp"
+           echo "PATH = /bin:/usr/bin" >> 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 "HAVE_DARWIN_OS = 1" >> config.mak
             echo "ENVP = MACOSX_DEPLOYMENT_TARGET=10.3" >> config.mak
-           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.9.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
+           echo "MACOSX_SDK = /Developer/SDKs/MacOSX10.3.0.sdk" >> config.mak
+#          EXTRA_CFLAGS=" -D\${ENVP} -isysroot \${MACOSX_SDK}"
+           EXTRA_CPPFLAGS=" -no-cpp-precomp"
+#          EXTRA_LDFLAGS=" -isysroot \${MACOSX_SDK} -Wl,-syslibroot,\${MACOSX_SDK}"
+           echo "PATH = /bin:/usr/bin" >> config.mak
         ;;
     i586-pc-beos)
-           echo "EXTRA_LDFLAGS = -lnet" >> config.mak
+            echo "HAVE_BEOS = 1" >> config.mak
+            if test -f /boot/beos/system/lib/libbind.so; then
+                EXTRA_LDFLAGS=" -lbind -lsocket"
+            else
+                EXTRA_LDFLAGS=" -lnet"
+            fi
+            if test "$HOST" = "$BUILD"; then
+#               Compiling on BeOS
+                PATH=".:/boot/home/config/bin:/bin:/boot/apps"
+                PATH="${PATH}:/boot/preferences:/boot/beos/apps"
+                PATH="${PATH}:/boot/beos/preferences"
+                PATH="${PATH}:/boot/develop/tools/gnupro/bin"
+                echo "PATH = ${PATH}" >> config.mak
+                LIBRARY_PATH="${LIBRARY_PATH}:%A/lib:/boot/home/config/lib"
+                LIBRARY_PATH="${LIBRARY_PATH}:/boot/beos/system/lib"
+                echo "LIBRARY_PATH = ${LIBRARY_PATH}" >> config.mak
+            else
+#               Cross compiling from Linux
+                PATH="/opt/beos-tools/bin:/opt/cross-tools/bin"
+                PATH="${PATH}:/usr/bin:/bin"
+                echo "PATH = ${PATH}" >> config.mak
+            fi
+        ;;
+    i586-mingw32msvc)
+            echo "HAVE_WIN32 = 1" >> config.mak
+            echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+        ;;
+    i686-pc-cygwin)
+            echo "HAVE_WIN32 = 1" >> config.mak
+            CC="gcc -mno-cygwin"
+            CXX="g++ -mno-cygwin"
+            EXTRA_CFLAGS=" -mno-cygwin"
+            EXTRA_CPPFLAGS=" -mno-cygwin"
+            EXTRA_LDFLAGS=" -mno-cygwin"
+            echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+        ;;
+    arm-wince-pe)
+            echo "HAVE_WINCE = 1" >> config.mak
+            echo "PKG_CONFIG_PATH = \$(PREFIX)/lib/pkgconfig" >> config.mak
+            EXTRA_CPPFLAGS=" -D_WIN32_WCE"
         ;;
     *)
         ;;
 esac
 
+echo "CC = ${CC}" >> config.mak
+echo "CXX = ${CXX}" >> config.mak
+echo "LD = ${LD}" >> config.mak
+echo "RANLIB = ${RANLIB}" >> config.mak
+echo "AR = ${AR}" >> config.mak
+echo "EXTRA_CFLAGS = ${EXTRA_CFLAGS}" >> config.mak
+echo "EXTRA_CPPFLAGS = ${EXTRA_CPPFLAGS}" >> config.mak
+echo "EXTRA_LDFLAGS = ${EXTRA_LDFLAGS}" >> config.mak
+echo "EXTRA_PATH = ${EXTRA_PATH}" >> config.mak
+
 if which curl >/dev/null; then
        echo "WGET = curl -O" >> config.mak
 elif wget --version >/dev/null 2>&1; then
@@ -86,5 +150,3 @@ elif svn help >/dev/null 2>&1; then
 else
         echo "You do not have a subversion client installed." >&2
 fi
-
-echo "PREFIX = `pwd`" >> config.mak