From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 25 Feb 2012 08:43:48 +0000 (+0100)
Subject: Link with local libopts if the installed is an old one.
X-Git-Tag: gnutls_3_0_15~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7bbd0213fb29c6b7445824964a462b16e4c07bd5;p=thirdparty%2Fgnutls.git

Link with local libopts if the installed is an old one.
---

diff --git a/NEWS b/NEWS
index 633351f506..f2ef1f4c49 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,15 @@ GnuTLS NEWS -- History of user-visible changes.                -*- outline -*-
 Copyright (C) 2000-2012 Free Software Foundation, Inc.
 See the end for copying conditions.
 
+* Version 3.0.15 (unreleased)
+
+** command line apps: Link with local libopts if the installed
+is an old one.
+
+** API and ABI modifications:
+No changes since last version.
+
+
 * Version 3.0.14 (released 2012-02-24)
 
 ** command line apps: Included libopts doesn't get installed
diff --git a/configure.ac b/configure.ac
index 2b452650ee..122b5a7ed4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,8 @@ fi
 AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 
 dnl Checks for programs in src/ 
+PKG_CHECK_MODULES([libopts], libopts >= 36.2.11,, [enable_local_libopts=yes])
+
 NEED_LIBOPTS_DIR=true
 LIBOPTS_CHECK([src/libopts])