Fix libtasn1 include paths.

diff --git a/NEWS b/NEWS
index f013cd1e5cc0800d6d284b5c2dc101eea4ef893d..f6ef2cf09a5b694bfddfde7fbbeb6d60742324d7 100644 (file)
--- 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 b54ba907fa72319507479e3a972a71231869f353..60a99ac0d578b92cc327b13574a4c202395c4d29 100644 (file)
--- 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 afffe8e4c951ae501bf9906e33b19c3e447877f0..2f1b43c7e3269d0d8d3e287170b83645cdca0bc8 100644 (file)
--- 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