1. text2pcap might need g_logv so we need to link with Glib. On
Solaris 7, we get the following error:
Undefined first referenced
symbol in file
g_logv text2pcap.o
2. "snprintf.h" is included too soon after config.h. On Solaris
2.5.1 and Tru64 UNIX 4.0D, the definition of size_t isn't
available by the time you #include.
--
albert chin (china@xxxxxxxxxxxxxxxxxx)
-- snip snip
--- Makefile.am.orig Thu Aug 29 19:38:44 2002
+++ Makefile.am Thu Aug 29 19:39:18 2002
@@ -770,7 +770,8 @@
text2pcap_DEPENDENCIES = text2pcap.h
# This automake variable adds to the link-line for the executable
-text2pcap_LDADD = $(text2pcap_optional_objects)
+text2pcap_LDADD = $(text2pcap_optional_objects) \
+ @GLIB_LIBS@ -lm
mergecap_SOURCES = mergecap.c
mergecap_DEPENDENCIES = wiretap/libwiretap.a
--- packet-dcerpc-samr.c.orig Thu Aug 29 19:30:28 2002
+++ packet-dcerpc-samr.c Thu Aug 29 19:30:48 2002
@@ -28,10 +28,6 @@
#include "config.h"
#endif
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
#include <glib.h>
#include <epan/packet.h>
#include <string.h>
@@ -41,6 +37,10 @@
#include "packet-dcerpc-lsa.h"
#include "smb.h" /* for "NT_errors[]" */
#include "packet-smb-common.h"
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
static int proto_dcerpc_samr = -1;
--- packet-dns.c.orig Thu Aug 29 19:31:15 2002
+++ packet-dns.c Thu Aug 29 19:31:24 2002
@@ -26,13 +26,13 @@
# include "config.h"
#endif
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
#include <stdio.h>
#include <string.h>
#include <memory.h>
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
#include <glib.h>
#include <epan/packet.h>
--- ipproto.c.orig Thu Aug 29 19:41:10 2002
+++ ipproto.c Thu Aug 29 19:41:18 2002
@@ -32,14 +32,14 @@
#include <glib.h>
-#ifdef NEED_SNPRINTF_H
-# include "snprintf.h"
-#endif
-
#include "ipproto.h"
#include <epan/packet.h>
#include <epan/resolv.h>
#include "packet-ip.h"
+
+#ifdef NEED_SNPRINTF_H
+# include "snprintf.h"
+#endif
static const value_string ipproto_val[] = {
{ IP_PROTO_ICMP, "ICMP" },
