D3D11: use defines for DXGI

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index 2f5ce733315a76b21be10bce2150d4359b17c1e4..76a93e117a022390b91f733e2fb8fc3596ebd2f1 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -19,32 +19,28 @@ fi
 
 ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 
+# Check for tools directory
+if test -d extras/tools/build/bin; then
+  PATH="`pwd`/extras/tools/build/bin:$PATH"
+fi
+
 ###
 ###  Get a sane environment, just in case
 ###
 CYGWIN=binmode
 export CYGWIN
 
+# Check for pkg-config
+if ! "${PKG_CONFIG:-pkg-config}" --version >/dev/null 2>&1; then
+       echo 'Error: "pkg-config" is not installed.' >&2
+       exit 1
+fi
+
 # Prepare m4/private.m4
 rm -f m4/private.m4 && cat > m4/private.m4 << EOF
 dnl  Private VLC macros - generated by bootstrap
 EOF
 
-# Check for pkg-config
-if ! pkg-config --version >/dev/null 2>&1; then
-       cat << EOF
-NOTE: "pkg-config" is missing from your system.
-Many underlying libraries will not be detected.
-==============================================================
-
-EOF
-       cat >> m4/private.m4 << EOF
-dnl  User does not have pkg-config, so assume package was not found
-AC_DEFUN([PKG_CHECK_MODULES],[ifelse([\$4], , :, [\$4])])
-
-EOF
-fi
-
 # Check for autopoint (GNU gettext)
 export AUTOPOINT
 test "$AUTOPOINT" || AUTOPOINT=autopoint
@@ -60,29 +56,15 @@ Otherwise, you will not be able to build a source tarball.
 EOF
 fi
 
-# Check for contrib directory
-if test -d extras/contrib/build/bin; then
-  PATH="`pwd`/extras/contrib/build/bin:$PATH"
-  if test -d extras/contrib/build/share/aclocal; then
-    ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/build/share/aclocal"
-  fi
-  if test ".`uname -s`" = ".Darwin"; then
-    LD_LIBRARY_PATH=./extras/contrib/build/lib:$LD_LIBRARY_PATH
-    DYLD_LIBRARY_PATH=./extras/contrib/build/lib:$DYLD_LIBRARY_PATH
-    export LD_LIBRARY_PATH
-    export DYLD_LIBRARY_PATH
-  fi
-fi
-
 ###
 ### Generate the modules makefile, by parsing modules/**/Modules.am
 ###
 
 echo "generating modules/**/Makefile.am"
-find modules/ -name Modules.am | \
-sed -ne 's,modules/\(.*\)/Modules.am,\1,p' | \
-while read d; do
-       sh modules/genmf "$d"
+for d in modules/*/*/Modules.am; do
+       d="${d#modules/}"
+       d="${d%/Modules.am}"
+       ${CONFIG_SHELL-sh} modules/genmf "$d"
        printf "."
 done
 printf "\n"
@@ -93,14 +75,8 @@ set -x
 ###  classic bootstrap stuff
 ###
 
-# Automake complains if these are not present
-echo > ABOUT-NLS
-cp -f INSTALL INSTALL.git
-
 autoreconf --install --force --verbose ${ACLOCAL_ARGS}
-rm -f po/Makevars.template ABOUT-NLS
-echo > ABOUT-NLS
-mv -f INSTALL.git INSTALL
+rm -f po/Makevars.template
 
 ##
 ##  files which need to be regenerated