From 790bb5ba82c9080a5535860e1573293967e26c29 Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Sun, 29 May 2011 09:25:50 +0100
Subject: [PATCH] Explicitly require pkg-config. It's not installed by default
 on OS X

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
---
 Makefile         | 5 +++++
 openconnect.html | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1c02167..4812160 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,11 @@ else
 OPT_FLAGS := -O2 -g -Wall
 endif
 
+PKGCONFIG=$(shell pkg-config --version)
+ifeq ($(PKGCONFIG),)
+$(error "No pkg-config. Cannot continue");
+endif
+
 # Allow people to override OpenSSL and build it statically, if they need
 # a special build for the DTLS support. $(OPENSSL) points to the build 
 # dir; there's no need to install it anywhere (we link it statically).
diff --git a/openconnect.html b/openconnect.html
index c623ccf..b5a6ef5 100644
--- a/openconnect.html
+++ b/openconnect.html
@@ -45,7 +45,8 @@ here's a simple intro to using OpenConnect.
       Some distributions like Fedora have packages; otherwise you can
       download it and type '<TT>make</TT>' to build it. To build it,
       you'll want development packages for <TT>libxml2</TT>, <TT>zlib</TT>
-      and obviously <TT>OpenSSL</TT> to be installed.
+      and obviously <TT>OpenSSL</TT> to be installed. You will also need
+      <tt>pkg-config</tt>.
   </LI>
   <LI>Install a <TT>vpnc-script</TT>.<BR>
       This script is what sets up all the addresses and routes for you; it's the
@@ -182,6 +183,7 @@ For full changelog entries including the latest development, see
 <UL>
   <LI><B>OpenConnect HEAD</B><BR>
      <UL>
+       <LI>Be more explicit about requiring <TT>pkg-config</TT>.</LI>
        <LI>Invoke script with <tt>reason=reconnect</tt> on CSTP reconnect.</LI>
        <LI>Add <TT>--non-inter</TT> option to avoid all user input.</LI>
      </UL><BR>
@@ -390,6 +392,7 @@ as from version 0.48.
 <H2>Requirements</H2>
 The basic text-mode client uses the following libraries:
 <UL>
+  <LI><B>pkg-config</B></LI>
   <LI><B>OpenSSL</B> &mdash; ideally at least 0.9.8m, although all versions from 0.9.7 onwards will work for basic connectivity. See note on DTLS compatibility below.</LI>
   <LI><B>libxml2</B></LI>
   <LI><B>zlib</B></LI>
@@ -476,6 +479,6 @@ An <TT>openconnect</TT> <A HREF="http://www.freebsd.org/cgi/cvsweb.cgi/ports/sec
 <hr>
 <address>David Woodhouse &lt;<A HREF="mailto:dwmw2@infradead.org">dwmw2@infradead.org</A>&gt;</address>
 <!-- hhmts start -->
-Last modified: Sun May 29 09:23:23 BST 2011
+Last modified: Sun May 29 09:24:58 BST 2011
 <!-- hhmts end -->
 </body> </html>
-- 
2.7.4