summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2008-06-23 21:29:30 +0200
committerSimon Josefsson <simon@josefsson.org>2008-06-23 21:29:30 +0200
commita0bedfb2a2e99ca7f7028698be762c657de90a25 (patch)
tree98e8bb371e52d7f7cd3850b5ddb257245969143e
parentc75f9967efa6005682c2e0316b4406920b92ea53 (diff)
downloadgnutls-a0bedfb2a2e99ca7f7028698be762c657de90a25.tar.gz
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>.
-rw-r--r--lib/Makefile.am7
1 files changed, 4 insertions, 3 deletions
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