X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=38f85ff2891ec439d556ef4a5009d7bef09fb8d1;hb=ccd35a73693c217f189806d2778b01ed41dce142;hp=2f5ce733315a76b21be10bce2150d4359b17c1e4;hpb=2ead0773f85b64553e8cc35be400f9f115ddd29a;p=vlc

diff --git a/bootstrap b/bootstrap
index 2f5ce73331..38f85ff289 100755
--- a/bootstrap
+++ b/bootstrap
@@ -25,25 +25,30 @@ ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
 CYGWIN=binmode
 export CYGWIN
 
-# Prepare m4/private.m4
-rm -f m4/private.m4 && cat > m4/private.m4 << EOF
-dnl  Private VLC macros - generated by bootstrap
-EOF
+# 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
 
 # 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])])
+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
-fi
 
 # Check for autopoint (GNU gettext)
 export AUTOPOINT
@@ -60,20 +65,6 @@ 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
 ###