dbus: Implement org.freedesktop.Properties.GetAll for the MPRIS root interface

[vlc] / bootstrap

diff --git a/bootstrap b/bootstrap
index a17fb78e978def60bad70a5393fb73a855a2a736..6726871a881b092bf56f89332fd951e8fe67530a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -19,24 +19,21 @@ 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 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
+# 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
@@ -44,21 +41,6 @@ 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