Wireshark-dev: [Wireshark-dev] Use of gcrypt and gnutls in version_info.c
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Albert Chin <wireshark-dev@xxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 6 Nov 2006 21:20:22 -0600
version_info.c has:
  #ifdef HAVE_LIBGCRYPT
  #include <gcrypt.h>
  #endif /* HAVE_LIBGCRYPT */

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

However, Makefile.am doesn't include the necessary CPPFLAGS/LDFLAGS to
resolve symbols from the above. Patch attached.

-- 
albert chin (china@xxxxxxxxxxxxxxxxxx)

Index: Makefile.am
===================================================================
--- Makefile.am	(revision 19843)
+++ Makefile.am	(working copy)
@@ -357,7 +357,8 @@
 mergecap_LDADD = wiretap/libwiretap.la @GLIB_LIBS@
 
 # Common headers
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
+	$(LIBGNUTLS_CFLAGS) $(LIBGCRYPT_CFLAGS)
 
 #
 # Build the version string
@@ -459,6 +460,7 @@
 dumpcap_LDADD = \
 	$(dumpcap_additional_libs)	\
 	@GLIB_LIBS@			\
+	@LIBGCRYPT_LIBS@		\
 	@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@
 
 #