From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 23 Jun 2008 19:29:30 +0000 (+0200)
Subject: Fix build failures related to opencdk.h.
X-Git-Tag: gnutls_2_5_0~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0bedfb2a2e99ca7f7028698be762c657de90a25;p=thirdparty%2Fgnutls.git

Fix build failures related to opencdk.h.
Reported by Roman Bogorodskiy <novel@FreeBSD.org> in
<http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/2930>.
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 83bc22cb76..2ff3862211 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -25,15 +25,13 @@ if ENABLE_MINITASN1
 SUBDIRS += minitasn1
 endif
 
-
 localedir = $(datadir)/locale
 
 AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"				\
 	-I$(top_srcdir)/lgl -I$(top_builddir)/lgl			\
 	-I$(top_srcdir)/includes -I../includes				\
 	-I$(srcdir)/x509						\
-	-I$(top_srcdir)/libextra -I$(top_srcdir)/lib/openpgp/	\
-	$(LIBGCRYPT_CFLAGS)
+	-I$(top_srcdir)/libextra -I$(top_srcdir)/lib/openpgp/
 
 if ENABLE_OPENPGP
 SUBDIRS += opencdk
@@ -47,6 +45,9 @@ else
 AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
 endif
 
+# Make sure this comes after any -I's for internal headers.
+AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS)
+
 bin_SCRIPTS = libgnutls-config
 
 m4datadir = $(datadir)/aclocal