Wireshark-dev: [Wireshark-dev] epan/dissectors/Makefile.am patch
From: Albert Chin <[email protected]>
Date: Tue, 29 Aug 2006 19:41:43 -0500
packet-ssl-utils.h has:
  #include <gnutls/x509.h>
  #include <gnutls/openssl.h>

However, $(LIBGNUTLS_CFLAGS) is not used by INCLUDES in
epan/dissectors/Makefile.am. Patch attached.

Ditt for epan/epan.c which needs $(LIBGNUTLS_CFLAGS)
$(LIBGCRYPT_CFLAGS) for INCLUDES for use with epan/epan.c:
  #ifdef HAVE_LIBGCRYPT
  #include <gcrypt.h>
  #endif /* HAVE_LIBGCRYPT */

  #ifdef HAVE_LIBGNUTLS
  #include <gnutls/gnutls.h>
  #endif /* HAVE_LIBGNUTLS */

-- 
albert chin ([email protected])
Index: epan/Makefile.am
===================================================================
--- epan/Makefile.am	(revision 19082)
+++ epan/Makefile.am	(working copy)
@@ -34,7 +34,8 @@
 
 include Makefile.common
 
-INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON)
+INCLUDES = -I$(srcdir)/.. -I$(srcdir)/$(LEMON) \
+	$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 libwireshark_la_SOURCES = \
 	$(LIBWIRESHARK_SRC)	\
Index: epan/dissectors/Makefile.am
===================================================================
--- epan/dissectors/Makefile.am	(revision 19082)
+++ epan/dissectors/Makefile.am	(working copy)
@@ -22,7 +22,8 @@
 
 noinst_LTLIBRARIES = libdissectors.la
 
-INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. $(LIBGCRYPT_CFLAGS)
+INCLUDES = -I$(srcdir)/../.. -I$(srcdir)/.. \
+	$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 include Makefile.common