Update version numbers to 0.7.0, and update win32 Makefiles. I made some

initial #ifdef changes to capture.c to support the win32 version of libpcap.

svn path=/trunk/; revision=428

9 files changed, 33 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 1ef0898caa..e1ff84f339 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,6 @@ ethereal_SOURCES = \
 	capture.h      \
 	column.c       \
 	column.h       \
-	config.h       \
 	dfilter-grammar.y \
 	dfilter-scanner.l \
 	dfilter.c      \
diff --git a/Makefile.nmake b/Makefile.nmake
index 6083603e7f..2816c6e7b4 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -20,9 +20,9 @@ LDFLAGS = /NOLOGO /SUBSYSTEM:console /INCREMENTAL:no /MACHINE:I386 \
 CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GTK_DIR) /Iwiretap \
 	/I$(GTK_DIR)\gdk\win32
 
-OBJECTS=capture.obj column.obj dfilter-grammar.obj dfilter.obj \
-	display.obj ethereal.obj ethertype.obj file.obj filter.obj \
-	follow.obj gtkpacket.obj menu.obj \
+OBJECTS=capture.obj column.obj dfilter-grammar.obj dfilter-scanner.obj \
+	dfilter.obj display.obj ethereal.obj ethertype.obj file.obj \
+	filter.obj follow.obj gtkpacket.obj menu.obj \
 	packet-aarp.obj \
 	packet-arp.obj \
 	packet-atalk.obj \
@@ -43,6 +43,7 @@ OBJECTS=capture.obj column.obj dfilter-grammar.obj dfilter.obj \
 	packet-ipv6.obj \
 	packet-ipx.obj \
 	packet-isakmp.obj \
+	packet-lapb.obj \
 	packet-llc.obj \
 	packet-lpd.obj \
 	packet-nbipx.obj \
@@ -71,6 +72,7 @@ OBJECTS=capture.obj column.obj dfilter-grammar.obj dfilter.obj \
 	packet-trmac.obj \
 	packet-udp.obj \
 	packet-vines.obj \
+	packet-x25.obj \
 	packet.obj prefs.obj print.obj proto.obj ps.obj \
 	resolv.obj snprintf.obj strerror.obj summary.obj util.obj
 
diff --git a/NEWS b/NEWS
index 105d14c9de..a6da6802fc 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,9 @@ Overview of changes in Ethereal 0.7.0:
 * Linux ATM Classical IP support (Theirry)
 * X.25 support in wiretap iptrace routine (Olivier)
 * Wiretap fix for "-S" ethereal option (Laurent)
+* LAPB and X.25 dissectors added (Olivier)
+* FreeBSD compilation cleanups (Bill Fumerola,
+	<billf@jade.chc-chimes.com>)
 
 Overview of changes in Ethereal 0.6.3:
 * Capture dialogue window data bug-fix (Guy)
diff --git a/VERSION b/VERSION
index 844f6a91ac..faef31a435 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.6.3
+0.7.0
diff --git a/capture.c b/capture.c
index 409052a469..e74e3ffcf3 100644
--- a/capture.c
+++ b/capture.c
@@ -1,7 +1,7 @@
 /* capture.c
  * Routines for packet capture windows
  *
- * $Id: capture.c,v 1.39 1999/08/02 06:08:58 gram Exp $
+ * $Id: capture.c,v 1.40 1999/08/03 20:51:31 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -42,11 +42,25 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+
 #include <time.h>
+
+#ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_NET_IF_H
 #include <net/if.h>
+#endif
+
 #include <signal.h>
 #include <errno.h>
 
diff --git a/configure.in b/configure.in
index 833791a5f7..5fa9e49343 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
-# $Id: configure.in,v 1.33 1999/07/31 23:06:13 gram Exp $
+# $Id: configure.in,v 1.34 1999/08/03 20:51:32 gram Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(etypes.h)
 
-AM_INIT_AUTOMAKE(ethereal, 0.6.3)
+AM_INIT_AUTOMAKE(ethereal, 0.7.0)
 
 dnl Check for CPU / vendor / OS
 AC_CANONICAL_HOST
diff --git a/ethereal.spec b/ethereal.spec
index 1be848100e..b0e9ebd1a2 100644
--- a/ethereal.spec
+++ b/ethereal.spec
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      0.6.3
+%define ver      0.7.0
 %define rel      1
 %define prefix   /usr/X11R6
 
@@ -13,7 +13,7 @@ Source:		ethereal-%{PACKAGE_VERSION}.tar.gz
 URL:		http://ethereal.zing.org/
 BuildRoot:	/tmp/ethereal-%{PACKAGE_VERSION}-root
 Packager:	FastJack <fastjack@i-s-o.net>
-Requires:	gtk+10
+Requires:	gtk+
 Requires:	libpcap
 
 %description
@@ -44,6 +44,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/X11R6/man/man1/ethereal.1
 
 %changelog
+* Tue Aug 03 1999 Gilbert Ramirez <gram@xiexie.org>
+- updated to 0.7.0 and changed gtk+ requirement
+
 * Sun Jan 01 1999 Gerald Combs <gerald@zing.org>
 - updated to 0.5.1
 
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index b680ed18d6..9f5fda3de9 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -9,7 +9,6 @@ CLEANFILES = \
 libwiretap_a_SOURCES = \
 	buffer.c		\
 	buffer.h		\
-	config.h		\
 	file.c			\
 	iptrace.c		\
 	iptrace.h		\
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 524c21cbb9..54c57e7283 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -5,7 +5,8 @@ LOCAL_CFLAGS=/Ic:\tools\msdev\include
 CFLAGS=/DHAVE_CONFIG_H /I$(GLIB_DIR) $(LOCAL_CFLAGS)
 
 OBJECTS=buffer.obj file.obj iptrace.obj lanalyzer.obj libpcap.obj \
-	netmon.obj netxray.obj ngsniffer.obj snoop.obj wtap.obj
+	netmon.obj netxray.obj ngsniffer.obj radcom.obj snoop.obj \
+	wtap.obj
 
 
 libwtap.lib	: config.h $(OBJECTS)