[vlc-commits] bootstrap: fail if pkg-config is absent

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Sep 19 17:45:48 2011 +0300| [3b851f4e9c531f2d90c305b3d632cddc082791fc] | committer: Rémi Denis-Courmont

bootstrap: fail if pkg-config is absent

It is still possible to compile from tarball without pkg-config, though
the result will probably be quite useless.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3b851f4e9c531f2d90c305b3d632cddc082791fc
---

 bootstrap |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/bootstrap b/bootstrap
index a17fb78..38f85ff 100755
--- a/bootstrap
+++ b/bootstrap
@@ -39,26 +39,17 @@ if test -d extras/contrib/build/bin; then
   fi
 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
 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