From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 12 Feb 2012 18:35:09 +0000 (+0100)
Subject: use NEED_LIBOPTS_DIR=true instead of modifying libopts.m4
X-Git-Tag: gnutls_3_0_13~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d2466e9816a4cd7c1df69c029cbc2ea1eae763a;p=thirdparty%2Fgnutls.git

use NEED_LIBOPTS_DIR=true instead of modifying libopts.m4
---

diff --git a/configure.ac b/configure.ac
index 72f9014677..f23c33c316 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,7 @@ fi
 AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
 
 dnl Checks for programs in src/ 
+NEED_LIBOPTS_DIR=true
 LIBOPTS_CHECK([src/libopts])
 
 AC_CHECK_TYPE(ssize_t,
diff --git a/src/libopts/m4/libopts.m4 b/src/libopts/m4/libopts.m4
index c8f89ecdc8..1f981aaefe 100644
--- a/src/libopts/m4/libopts.m4
+++ b/src/libopts/m4/libopts.m4
@@ -574,9 +574,8 @@ AC_DEFUN([LIBOPTS_CHECK], [
   LIBOPTS_CHECK_COMMON(AO_Libopts_Dir)
   AM_COND_IF([NEED_LIBOPTS], [
     INVOKE_LIBOPTS_MACROS
+    AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)
   ])dnl
-
-  AC_CONFIG_FILES(AO_Libopts_Dir/Makefile)
   m4_popdef([AO_Libopts_Dir])dnl
 # end of AC_DEFUN of LIBOPTS_CHECK
 ])