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 83bc22cb76b36771ce58d89677126fc1a8bdd6b9..2ff3862211def4ea0741b6b84198c714996bbcb1 100644 (file)
--- 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