[glib-networking] gnutls: correctly set CFLAGS using GNUTLS_CFLAGS

[Dan Winship <danw src gnome org>]

commit da4ff99619f707c76e526ecde08ed299fe201496
Author: Emmanuel Pacaud <emmanuel gnome org>
Date:   Mon Mar 25 14:38:23 2013 +0100

    gnutls: correctly set CFLAGS using GNUTLS_CFLAGS
    
    (recommit with correct bug url)
    
    https://bugzilla.gnome.org/show_bug.cgi?id=696519

 tls/gnutls/Makefile.am |    2 +-
 tls/tests/Makefile.am  |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tls/gnutls/Makefile.am b/tls/gnutls/Makefile.am
index fd83f4f..c2ab465 100644
--- a/tls/gnutls/Makefile.am
+++ b/tls/gnutls/Makefile.am
@@ -49,7 +49,7 @@ libgiognutls_la_SOURCES =             \
 
 INCLUDES +=                            \
        $(P11_CFLAGS)                   \
-       $(LIBGNUTLS_CFLAGS)             \
+       $(GNUTLS_CFLAGS)                \
        $(NULL)
 
 libgiognutls_la_LDFLAGS = $(module_flags)
diff --git a/tls/tests/Makefile.am b/tls/tests/Makefile.am
index 94fd6f2..305394d 100644
--- a/tls/tests/Makefile.am
+++ b/tls/tests/Makefile.am
@@ -25,7 +25,10 @@ TEST_PROGS +=              \
        pkcs11-pin         \
        pkcs11-slot
 
-INCLUDES += $(PKCS11_CFLAGS)
+INCLUDES +=                    \
+       $(PKCS11_CFLAGS)        \
+       $(GNUTLS_CFLAGS)
+
 LDADD += $(top_builddir)/tls/pkcs11/libgiopkcs11.la $(PKCS11_LIBS)
 
 pkcs11_slot_SOURCES = pkcs11-slot.c \