Fix the condition for HAVE_QTKIT.

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index b504173c3d065e3b0b75ebe5d88039c625e1bca4..b24310f04194fdb33df6a2a8e87d2b97128162ac 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -26,6 +26,8 @@ usage()
        echo "  --prefix=PREFIX  install files in PREFIX"
        echo "  --disable-FOO    configure to not build package FOO"
        echo "  --enable-FOO     configure to build package FOO"
+       echo "  --disable-disc   configure to not build optical discs packages"
+       echo "  --disable-sout   configure to not build stream output packages"
 }
 
 BUILD=
@@ -33,8 +35,10 @@ HOST=
 PREFIX=
 PKGS_ENABLE=
 PKGS_DISABLE=
+BUILD_ENCODERS="1"
+BUILD_DISCS="1"
 
-if test ! -f "../src/main.mak"
+if test ! -f "../../contrib/src/main.mak"
 then
        echo "$0 must be run from a subdirectory"
        exit 1
@@ -56,6 +60,12 @@ do
                --prefix=*)
                        PREFIX="${1#--prefix=}"
                        ;;
+               --disable-disc)
+                       BUILD_DISCS=
+                       ;;
+               --disable-sout)
+                       BUILD_ENCODERS=
+                       ;;
                --disable-*)
                        PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}"
                        ;;
@@ -93,17 +103,11 @@ if test "$PREFIX"
 then
        # strip trailing slash
        PREFIX="${PREFIX%/}"
-else
-       PREFIX="../hosts/$HOST"
 fi
 
 #
 # Prepare files
 #
-echo "Creating prefix... $PREFIX"
-mkdir -p -- "$PREFIX" || exit $?
-mkdir -p -- "$PREFIX/share/aclocal" || exit $?
-
 echo "Creating configuration file... config.mak"
 exec 3>config.mak
 cat >&3 << EOF
@@ -111,7 +115,6 @@ cat >&3 << EOF
 # Any change will be overwritten if ../bootstrap is run again.
 BUILD := $BUILD
 HOST := $HOST
-PREFIX := $PREFIX
 PKGS_DISABLE := $PKGS_DISABLE
 PKGS_ENABLE := $PKGS_ENABLE
 EOF
@@ -134,6 +137,10 @@ add_make_enabled()
        done
 }
 
+test -z "$PREFIX" || add_make "PREFIX := $PREFIX"
+test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
+test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
+
 #
 # Checks
 #
@@ -151,20 +158,19 @@ case "${OS}" in
        *linux*)
                add_make_enabled "HAVE_LINUX"
                ;;
-       *mingw*)
-               add_make_enabled "HAVE_WIN32"
-               ;;
        *wince*)
                add_make_enabled "HAVE_WINCE"
                ;;
+       *mingw*)
+               add_make_enabled "HAVE_WIN32"
+               ;;
 esac
-add_make_enabled "BUILD_ENCODERS"
 
 #
 # Results output
 #
 test -e Makefile && unlink Makefile
-ln -sf ../src/main.mak Makefile
+ln -sf ../../contrib/src/main.mak Makefile
 cat << EOF
 Bootstrap completed.
 
@@ -178,6 +184,9 @@ Other targets:
  * make fetch        fetch required source tarballs
  * make fetch-all    fetch all source tarballs
  * make distclean    clean everything and undo bootstrap
- * make clean        clean everything
  * make mostlyclean  clean everything except source tarballs
+ * make clean        clean everything
+ * make list         list packages
 EOF
+
+mkdir -p ../../contrib/tarballs