diff options
-rw-r--r-- | Makefile.in | 6 | ||||
-rwxr-xr-x | configure | 45 | ||||
-rw-r--r-- | configure.in | 40 | ||||
-rw-r--r-- | tcpdump.1.in (renamed from tcpdump.1) | 10 |
4 files changed, 89 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index e28e186a..6288393c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ # WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. # -# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.317.2.4 2008-05-27 07:14:26 guy Exp $ (LBL) +# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.317.2.5 2008-10-27 21:16:37 guy Exp $ (LBL) # # Various configurable paths (remember to edit Makefile.in, not Makefile) @@ -258,7 +258,7 @@ EXTRA_DIST = \ smbutil.c \ stime.awk \ strcasecmp.c \ - tcpdump.1 \ + tcpdump.1.in \ vfprintf.c \ win32/Include/Arpa/tftp.h \ win32/Include/errno.h \ @@ -344,7 +344,7 @@ clean: distclean: rm -f $(CLEANFILES) Makefile config.cache config.log config.status \ - config.h gnuc.h os-proto.h stamp-h stamp-h.in + config.h gnuc.h os-proto.h stamp-h stamp-h.in $(PROG).1 tags: $(TAGFILES) ctags -wtd $(TAGFILES) @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.196.2.6 . +# From configure.in Revision: 1.196.2.7 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -678,6 +678,8 @@ V_GROUP V_INCLS V_PCAPDEP LOCALSRC +MAN_FILE_FORMATS +MAN_MISC_INFO INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -11445,6 +11447,12 @@ V_GROUP=0 if test -f /etc/group -a ! -z "`grep '^wheel:' /etc/group`" ; then V_GROUP=wheel fi +# +# Assume V7/BSD convention for man pages (file formats in section 5, +# miscellaneous info in section 7). +# +MAN_FILE_FORMATS=5 +MAN_MISC_INFO=7 case "$host_os" in aix*) @@ -11454,16 +11462,42 @@ _ACEOF ;; +hpux*) + # + # Use System V conventions for man pages. + # + MAN_FILE_FORMATS=4 + MAN_MISC_INFO=5 + ;; + irix*) V_GROUP=sys + + # + # Use System V conventions for man pages. + # + MAN_FILE_FORMATS=4 + MAN_MISC_INFO=5 ;; osf*) V_GROUP=system + + # + # Use System V conventions for man pages. + # + MAN_FILE_FORMATS=4 + MAN_MISC_INFO=5 ;; solaris*) V_GROUP=sys + + # + # Use System V conventions for man pages. + # + MAN_FILE_FORMATS=4 + MAN_MISC_INFO=5 ;; esac @@ -13618,6 +13652,8 @@ fi + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -13704,7 +13740,7 @@ ac_config_headers="$ac_config_headers config.h" ac_config_commands="$ac_config_commands default-1" -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile tcpdump.1" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -14271,6 +14307,7 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "tcpdump.1") CONFIG_FILES="$CONFIG_FILES tcpdump.1" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} @@ -14397,13 +14434,15 @@ V_GROUP!$V_GROUP$ac_delim V_INCLS!$V_INCLS$ac_delim V_PCAPDEP!$V_PCAPDEP$ac_delim LOCALSRC!$LOCALSRC$ac_delim +MAN_FILE_FORMATS!$MAN_FILE_FORMATS$ac_delim +MAN_MISC_INFO!$MAN_MISC_INFO$ac_delim INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim INSTALL_DATA!$INSTALL_DATA$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 68; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 70; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index f3528c4d..ab2769ec 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.196.2.6 2008-09-25 21:50:04 guy Exp $ (LBL) +dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.196.2.7 2008-10-27 21:16:37 guy Exp $ (LBL) dnl dnl Copyright (c) 1994, 1995, 1996, 1997 dnl The Regents of the University of California. All rights reserved. @@ -6,7 +6,7 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl -AC_REVISION($Revision: 1.196.2.6 $) +AC_REVISION($Revision: 1.196.2.7 $) AC_PREREQ(2.50) AC_INIT(tcpdump.c) @@ -779,6 +779,12 @@ V_GROUP=0 if test -f /etc/group -a ! -z "`grep '^wheel:' /etc/group`" ; then V_GROUP=wheel fi +# +# Assume V7/BSD convention for man pages (file formats in section 5, +# miscellaneous info in section 7). +# +MAN_FILE_FORMATS=5 +MAN_MISC_INFO=7 case "$host_os" in aix*) @@ -786,16 +792,42 @@ aix*) AC_DEFINE(_SUN) ;; +hpux*) + # + # Use System V conventions for man pages. + # + MAN_FILE_FORMATS=4 + MAN_MISC_INFO=5 + ;; + irix*) V_GROUP=sys + + # + # Use System V conventions for man pages. + # + MAN_FILE_FORMATS=4 + MAN_MISC_INFO=5 ;; osf*) V_GROUP=system + + # + # Use System V conventions for man pages. + # + MAN_FILE_FORMATS=4 + MAN_MISC_INFO=5 ;; solaris*) V_GROUP=sys + + # + # Use System V conventions for man pages. + # + MAN_FILE_FORMATS=4 + MAN_MISC_INFO=5 ;; esac @@ -1024,6 +1056,8 @@ AC_SUBST(V_GROUP) AC_SUBST(V_INCLS) AC_SUBST(V_PCAPDEP) AC_SUBST(LOCALSRC) +AC_SUBST(MAN_FILE_FORMATS) +AC_SUBST(MAN_MISC_INFO) AC_PROG_INSTALL @@ -1034,5 +1068,5 @@ AC_OUTPUT_COMMANDS([if test -f .devel; then cat Makefile-devel-adds >> Makefile make depend fi]) -AC_OUTPUT(Makefile) +AC_OUTPUT(Makefile tcpdump.1) exit 0 diff --git a/tcpdump.1 b/tcpdump.1.in index 77d82e80..09566513 100644 --- a/tcpdump.1 +++ b/tcpdump.1.in @@ -1,4 +1,4 @@ -.\" @(#) $Header: /tcpdump/master/tcpdump/Attic/tcpdump.1,v 1.185.2.6 2008-05-30 01:38:21 guy Exp $ (LBL) +.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1.in,v 1.1.2.2 2008-10-27 21:16:37 guy Exp $ (LBL) .\" .\" $NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp $ .\" @@ -513,6 +513,9 @@ Write the raw packets to \fIfile\fR rather than parsing and printing them out. They can later be printed with the \-r option. Standard output is used if \fIfile\fR is ``-''. +See +.BR pcap-savefile (@MAN_FILE_FORMATS@) +for a description of the file format. .TP .B \-W Used in conjunction with the @@ -606,7 +609,7 @@ Otherwise, only packets for which \fIexpression\fP is `true' will be dumped. .LP For the \fIexpression\fP syntax, see -.BR pcap-filter (4). +.BR pcap-filter (@MAN_MISC_INFO@). .LP Expression arguments can be passed to \fItcpdump\fP as either a single argument or as multiple arguments, whichever is more convenient. @@ -1610,7 +1613,8 @@ is made to account for the time lag between when the Ethernet interface removed the packet from the wire and when the kernel serviced the `new packet' interrupt. .SH "SEE ALSO" -stty(1), pcap(3PCAP), pcap-filter(4), bpf(4), nit(4P) +stty(1), pcap(3PCAP), bpf(4), nit(4P), pcap-savefile(@MAN_FILE_FORMATS@), +pcap-filter(@MAN_MISC_INFO@) .SH AUTHORS The original authors are: .LP |