From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 26 Feb 2012 19:27:38 +0000 (+0100)
Subject: Revert "always link against the distributed libopts"
X-Git-Tag: gnutls_3_0_15~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d434c0adf9287d69ceade1f975993607af243eb5;p=thirdparty%2Fgnutls.git

Revert "always link against the distributed libopts"

This reverts commit ae3033fee01f058a028406648ebc32294774e282.
---

diff --git a/configure.ac b/configure.ac
index 3d0a617da5..4550adf6a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,8 +148,8 @@ fi
 AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 
 dnl Checks for programs in src/ 
+PKG_CHECK_MODULES([autoopts], autoopts >= 36.2.11,, [enable_local_libopts=yes])
 
-enable_local_libopts=yes
 NEED_LIBOPTS_DIR=true
 LIBOPTS_CHECK([src/libopts])
 
@@ -504,6 +504,7 @@ if features are disabled)
 AC_MSG_NOTICE([Optional applications:
 
   crywrap app:      $libidn
+  local libopts:    $enable_local_libopts
 ])
 
 AC_MSG_NOTICE([Optional libraries: