From: Simon Josefsson <simon@josefsson.org>
Date: Fri, 29 Aug 2008 08:00:55 +0000 (+0200)
Subject: Fix libtasn1 include paths.
X-Git-Tag: gnutls_2_5_5~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b855779d46c07ae5a03280536e24f8405c374dcf;p=thirdparty%2Fgnutls.git

Fix libtasn1 include paths.
---

diff --git a/NEWS b/NEWS
index f013cd1e5c..f6ef2cf09a 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ See the end for copying conditions.
 
 * Version 2.5.5 (unreleased)
 
+** libgnutls: Fix include paths so that building with internal libtasn1 works.
+Reported by "jth.net ApS" <info@jth.net>.
+
 ** libgnutls: Fix segmentation fault when generating private keys.
 Reported by Daniel Kahn Gillmor <dkg-debian.org@fifthhorseman.net>.
 
diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index b54ba907fa..60a99ac0d5 100644
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -24,6 +24,12 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib \
 	-I$(top_srcdir)/includes -I$(top_builddir)/includes \
 	-I$(top_srcdir)/lgl -I$(top_builddir)/lgl
 
+if ENABLE_MINITASN1
+AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
+else
+AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
+endif
+
 noinst_LTLIBRARIES = libminiopencdk.la
 
 libminiopencdk_la_SOURCES = armor.c filters.h keydb.h main.c types.h	\
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index afffe8e4c9..2f1b43c7e3 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -20,10 +20,15 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/lgl -I$(top_builddir)/lgl			\
-	-I$(top_srcdir)/libextra -I$(top_srcdir)/lib/minitasn1		\
-	-I$(top_srcdir)/lib		\
+	-I$(top_srcdir)/lib						\
 	-I$(top_srcdir)/includes -I$(top_builddir)/includes		\
-	$(LIBOPENCDK_CFLAGS) $(LIBTASN1_CFLAGS) $(LIBGCRYPT_CFLAGS)
+	$(LIBOPENCDK_CFLAGS) $(LIBGCRYPT_CFLAGS)
+
+if ENABLE_MINITASN1
+AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
+else
+AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
+endif
 
 noinst_LTLIBRARIES = libgnutls_x509.la