Revert "gnutls: correctly set CFLAGS using GNUTLS_CFLAGS"

This reverts commit 9802180053a0e8eb23116d2f6cd6abb32d9bab3b.

diff --git a/tls/gnutls/Makefile.am b/tls/gnutls/Makefile.am
index c2ab465..fd83f4f 100644 (file)
--- a/tls/gnutls/Makefile.am
+++ b/tls/gnutls/Makefile.am
@@ -49,7 +49,7 @@ libgiognutls_la_SOURCES =             \
 
 INCLUDES +=                            \
        $(P11_CFLAGS)                   \
-       $(GNUTLS_CFLAGS)                \
+       $(LIBGNUTLS_CFLAGS)             \
        $(NULL)
 
 libgiognutls_la_LDFLAGS = $(module_flags)

diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
index 305394d..94fd6f2 100644 (file)
--- a/tls/tests/Makefile.am
+++ b/tls/tests/Makefile.am
@@ -25,10 +25,7 @@ TEST_PROGS +=              \
        pkcs11-pin         \
        pkcs11-slot
 
-INCLUDES +=                    \
-       $(PKCS11_CFLAGS)        \
-       $(GNUTLS_CFLAGS)
-
+INCLUDES += $(PKCS11_CFLAGS)
 LDADD += $(top_builddir)/tls/pkcs11/libgiopkcs11.la $(PKCS11_LIBS)
 
 pkcs11_slot_SOURCES = pkcs11-slot.c \