Get rid of configure in wiretap. Finally!

svn path=/trunk/; revision=23795
This commit is contained in:
Jörg Mayer 2007-12-07 18:59:32 +00:00
parent be6e31fa44
commit 4fa211ef56
8 changed files with 2 additions and 1045 deletions

View File

@ -185,6 +185,7 @@ AC_ARG_ENABLE(extra-gcc-checks,
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-long-long)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wbad-function-cast)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wcast-qual)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wcast-align)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wwrite-strings)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wshorten-64-to-32)
AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wstrict-prototypes)
@ -1527,7 +1528,6 @@ dnl Save the cacheable configure results to config.cache before recursing
AC_CACHE_SAVE
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SUBDIRS(wiretap)
AC_OUTPUT(
Makefile
doxygen.cfg
@ -1656,6 +1656,7 @@ AC_OUTPUT(
tools/Makefile
tools/idl2wrs.sh
tools/lemon/Makefile
wiretap/Makefile
,)
dnl AC_CONFIG_FILES([tools/setuid-root.pl], [chmod +x tools/setuid-root.pl])

View File

@ -1,340 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have. You must make sure that they, too, receive or can get the
source code. And you must show them these terms so they know their
rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software
patents. We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary. To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your
cost of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.
If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded. In such case, this License incorporates
the limitation as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation. If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission. For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) 19yy <name of author>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
Gnomovision version 69, Copyright (C) 19yy name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.
You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
`Gnomovision' (which makes passes at compilers) written by James Hacker.
<signature of Ty Coon>, 1 April 1989
Ty Coon, President of Vice
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Library General
Public License instead of this License.

View File

@ -1,32 +0,0 @@
July 7, 1999
Removed display filter support.
May 12, 1999
Guy added support for Netmon 2.0 files.
March 1, 1999
Added first code for display filters.
February 20, 1999
Guy added the netxray file format.
January 27, 1999
Added token-ring support in netmon.c
January 19, 1999
Changed number of arguments of wtap_open_offline().
January 14, 1999
Guy added support for reading Microsoft Network Monitor files.
January 7, 1999
Made all filetypes provide a per-packet encapsulation type, and
removed wtap_encapsulation(), effectively getting rid of a per-file
encapsulation type.
January 1, 1999
Added iptrace file format.
December 10, 1998
Proper timestamp calculations added to ngsniffer.c and lanalyzer.c

View File

@ -1,3 +0,0 @@
Currently there is no need to install this library. Since wiretap has just
been born, only wireshark uses it. Once wiretap becomes powerful enough to be
use outside of wireshark, then we can worry about installation.

View File

@ -1,2 +0,0 @@
Wiretap 0.0.0:
* Initial public release (in wireshark CVS tree)

View File

@ -1,305 +0,0 @@
dnl Macros that test for specific features.
dnl This file is part of the Autoconf packaging for Wireshark.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
dnl $Id$
dnl
#
# AC_WIRETAP_ADD_DASH_L
#
# Add to the variable specified as the first argument a "-L" flag for the
# directory specified as the second argument, and, on Solaris, add a
# "-R" flag for it as well.
#
# XXX - IRIX, and other OSes, may require some flag equivalent to
# "-R" here.
#
AC_DEFUN([AC_WIRETAP_ADD_DASH_L],
[$1="$$1 -L$2"
case "$host_os" in
solaris*)
$1="$$1 -R$2"
;;
esac
])
#
# AC_WIRETAP_PCAP_CHECK
#
AC_DEFUN([AC_WIRETAP_PCAP_CHECK],
[
if test -z "$pcap_dir"
then
#
# The user didn't specify a directory in which libpcap resides;
# we assume that the current library search path will work,
# but we may have to look for the header in a "pcap"
# subdirectory of "/usr/include" or "/usr/local/include",
# as some systems apparently put "pcap.h" in a "pcap"
# subdirectory, and we also check "$prefix/include".
#
# XXX - should we just add "$prefix/include" to the include
# search path?
#
AC_MSG_CHECKING(for extraneous pcap header directories)
found_pcap_dir=""
for pcap_dir in /usr/include/pcap $prefix/include /usr/local/include/pcap
do
if test -d $pcap_dir ; then
if test x$pcap_dir != x/usr/include; then
CFLAGS="$CFLAGS -I$pcap_dir"
CPPFLAGS="$CPPFLAGS -I$pcap_dir"
fi
found_pcap_dir=" $found_pcap_dir -I$pcap_dir"
break
fi
done
if test "$found_pcap_dir" != "" ; then
AC_MSG_RESULT(found --$found_pcap_dir added to CFLAGS)
else
AC_MSG_RESULT(not found)
fi
else
#
# The user specified a directory in which libpcap resides,
# so add the "include" subdirectory of that directory to
# the include file search path.
#
# XXX - if there's also a libpcap in a directory that's
# already in CFLAGS or CPPFLAGS, this won't make us find
# the version in the specified directory, as the compiler
# will search that other directory before it searches the
# specified directory.
#
CFLAGS="$CFLAGS -I$pcap_dir/include"
CPPFLAGS="$CPPFLAGS -I$pcap_dir/include"
fi
# Pcap header check
AC_CHECK_HEADERS(pcap.h)
])
#
# AC_WIRETAP_ZLIB_CHECK
#
AC_DEFUN([AC_WIRETAP_ZLIB_CHECK],
[
if test "x$zlib_dir" != "x"
then
#
# The user specified a directory in which zlib resides,
# so add the "include" subdirectory of that directory to
# the include file search path and the "lib" subdirectory
# of that directory to the library search path.
#
# XXX - if there's also a zlib in a directory that's
# already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
# make us find the version in the specified directory,
# as the compiler and/or linker will search that other
# directory before it searches the specified directory.
#
wiretap_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I$zlib_dir/include"
wiretap_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
wiretap_save_LIBS="$LIBS"
AC_WIRETAP_ADD_DASH_L(LIBS, $zlib_dir/lib)
fi
#
# Make sure we have "zlib.h". If we don't, it means we probably
# don't have zlib, so don't use it.
#
AC_CHECK_HEADER(zlib.h,,
[
if test "x$zlib_dir" != "x"
then
#
# The user used "--with-zlib=" to specify a directory
# containing zlib, but we didn't find the header file
# there; that either means they didn't specify the
# right directory or are confused about whether zlib
# is, in fact, installed. Report the error and give up.
#
AC_MSG_ERROR([zlib header not found in directory specified in --with-zlib])
else
if test "x$want_zlib" = "xyes"
then
#
# The user tried to force us to use the library, but we
# couldn't find the header file; report an error.
#
AC_MSG_ERROR(Header file zlib.h not found.)
else
#
# We couldn't find the header file; don't use the
# library, as it's probably not present.
#
want_zlib=no
fi
fi
])
if test "x$want_zlib" != "xno"
then
#
# Well, we at least have the zlib header file.
#
# Check for "gzgets()" in zlib, because we need it, but
# some older versions of zlib don't have it. It appears
# from the zlib ChangeLog that any released version of zlib
# with "gzgets()" should have the other routines we
# depend on, such as "gzseek()", "gztell()", and "zError()".
#
# Another reason why we require "gzgets()" is that
# some versions of zlib that didn't have it, such
# as 1.0.8, had a bug in "gzseek()" that meant that it
# doesn't work correctly on uncompressed files; this
# means we cannot use version 1.0.8. (Unfortunately,
# that's the version that comes with recent X11 source,
# and many people who install XFree86 on their Slackware
# boxes don't realize that they should configure it to
# use the native zlib rather than building and installing
# the crappy old version that comes with XFree86.)
#
# I.e., we can't just avoid using "gzgets()", as
# versions of zlib without "gzgets()" are likely to have
# a broken "gzseek()".
#
AC_CHECK_LIB(z, gzgets,
[
if test "x$zlib_dir" != "x"
then
#
# Put the "-I" and "-L" flags for zlib at
# the beginning of CFLAGS, CPPFLAGS, and
# LIBS.
#
LIBS=""
AC_WIRETAP_ADD_DASH_L(LIBS, $zlib_dir/lib)
LIBS="$LIBS -lz $wiretap_save_LIBS"
else
LIBS="-lz $LIBS"
fi
AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library])
],[
if test "x$zlib_dir" != "x"
then
#
# Restore the versions of CFLAGS, CPPFLAGS,
# and LIBS before we added the "-with-zlib="
# directory, as we didn't actually find
# zlib there, or didn't find a zlib that
# contains gzgets there.
#
CFLAGS="$wiretap_save_CFLAGS"
CPPFLAGS="$wiretap_save_CPPFLAGS"
LIBS="$wiretap_save_LIBS"
fi
want_zlib=no
])
fi
if test "x$want_zlib" != "xno"
then
#
# Well, we at least have the zlib header file and a zlib
# with "gzgets()".
#
# Now check for "gzgets()" in zlib when linking with the
# linker flags for GTK+ applications; people often grab
# XFree86 source and build and install it on their systems,
# and they appear sometimes to misconfigure XFree86 so that,
# even on systems with zlib, it assumes there is no zlib,
# so the XFree86 build process builds and installs its
# own zlib in the X11 library directory.
#
# The XFree86 zlib is an older version that lacks
# "gzgets()", and that's the zlib with which Wireshark
# gets linked, so the build of Wireshark fails.
#
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTK_CFLAGS"
LIBS="$GTK_LIBS -lz $LIBS"
AC_MSG_CHECKING([for gzgets missing when linking with X11])
AC_TRY_LINK_FUNC(gzgets, AC_MSG_RESULT(no),
[
AC_MSG_RESULT(yes)
AC_MSG_ERROR(old zlib found when linking with X11 - get rid of old zlib.)
])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
])
dnl
dnl Check whether a given format can be used to print 64-bit integers
dnl
AC_DEFUN([AC_WIRETAP_CHECK_64BIT_FORMAT],
[
AC_MSG_CHECKING([whether %$1x can be used to format 64-bit integers])
AC_RUN_IFELSE(
[
AC_LANG_SOURCE(
[[
#include <glib.h>
#if GTK_MAJOR_VERSION >= 2
#include <glib/gprintf.h>
#endif
#include <stdio.h>
main()
{
guint64 t = 1;
char strbuf[16+1];
g_snprintf(strbuf, sizeof strbuf, "%016$1x", t << 32);
if (strcmp(strbuf, "0000000100000000") == 0)
exit(0);
else
exit(1);
}
]])
],
[
AC_DEFINE(G_GINT64_MODIFIER, "$1", [Format modifier for printing 64-bit numbers])
AC_MSG_RESULT(yes)
],
[
AC_MSG_RESULT(no)
$2
])
])
#
# AC_WIRETAP_GCC_CFLAGS_CHECK
#
# $1 : cflags to test
#
# The macro first determines if the compiler is GCC. Then compile with the
# defined cflags. The defined flags are added to CFLAGS only if the compilation
# succeeds.
#
AC_DEFUN([AC_WIRETAP_GCC_CFLAGS_CHECK],
[GCC_OPTION="$1"
AC_MSG_CHECKING(whether we can add $GCC_OPTION to CFLAGS)
if test "x$GCC" != "x"; then
CFLAGS_saved="$CFLAGS"
CFLAGS="$CFLAGS $GCC_OPTION"
AC_COMPILE_IFELSE([
AC_LANG_SOURCE([[
int foo;
]])],
[
AC_MSG_RESULT(yes)
],
[
AC_MSG_RESULT(no)
CFLAGS="$CFLAGS_saved"
])
else
AC_MSG_RESULT(no)
fi
])

View File

@ -1,362 +0,0 @@
# $Id$
#
AC_INIT(wtap.c)
AC_PREREQ(2.52)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(libwtap.a, 0.0.0)
AM_CONFIG_HEADER(config.h)
AM_DISABLE_STATIC
dnl Checks for programs.
AC_PROG_CC
AC_PROG_CPP
AC_PROG_YACC
AM_PROG_LEX
AC_PROG_LIBTOOL
AC_PATH_PROG(LEX, flex)
#
# Try to add some additional gcc checks to CFLAGS
#
AC_ARG_ENABLE(extra-gcc-checks,
AC_HELP_STRING( [--enable-extra-gcc-checks],
[Do additional -W checks in GCC. @<:@default=no@:>@]),
[
wireshark_extra_gcc_flags=$enableval
if test $enableval != no
then
AC_WIRETAP_GCC_CFLAGS_CHECK(-pedantic)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wno-long-long)
fi
],)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wall -W)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wdeclaration-after-statement)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wendif-labels)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wpointer-arith)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wbad-function-cast)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wcast-qual)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wwrite-strings)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wshorten-64-to-32)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wstrict-prototypes)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wmissing-declarations)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wno-pointer-sign)
AC_WIRETAP_GCC_CFLAGS_CHECK(-Wcast-align)
#
# If we're running gcc add '-D_U_="__attribute__((unused))"' to CFLAGS as well,
# so we can use _U_ to flag unused function arguments and not get warnings
# about them. Otherwise, add '-D_U_=""', so that _U_ used to flag an unused
# function argument will compile with non-GCC compilers.
#
if test "x$GCC" = "xyes" ; then
CFLAGS="-D_U_=\"__attribute__((unused))\" $CFLAGS"
else
CFLAGS="-D_U_=\"\" $CFLAGS"
fi
#
# If we're running gcc, will enable a barrier "stop on warning".
# This barrier is set for a very large part of the code. However, it is
# typically not set for "generated" code (lex, ans2wrs, idl2wrs, ...)
#
warnings_as_errors_default="yes"
AC_MSG_CHECKING(whether we should treat compiler warnings as errors)
AC_ARG_ENABLE(warnings-as-errors,
AC_HELP_STRING( [--enable-warnings-as-errors],
[Treat warnings as errors (only for gcc). @<:@default=yes@:>@]),
[
if test "x$GCC" = "xyes" -a "x$enableval" == "xyes" -a "x$wireshark_extra_gcc_flags" != "xyes"; then
with_warnings_as_errors="yes"
AC_MSG_RESULT(yes)
else
with_warnings_as_errors="no"
AC_MSG_RESULT(no)
fi
],
if test "x$GCC" = "xyes" -a "x$wireshark_extra_gcc_flags" = "x" -a "x$warnings_as_errors_default" = "xyes"; then
with_warnings_as_errors="yes"
AC_MSG_RESULT(yes)
else
with_warnings_as_errors="no"
AC_MSG_RESULT(no)
fi
)
AM_CONDITIONAL(HAVE_WARNINGS_AS_ERRORS, test "x$with_warnings_as_errors" = "xyes")
#
# Add any platform-specific compiler flags needed.
#
AC_MSG_CHECKING(for platform-specific compiler flags)
if test "x$GCC" = "xyes" ; then
#
# GCC - do any platform-specific tweaking necessary.
#
case "$host_os" in
darwin*)
#
# See comments above about Apple's lovely C compiler.
#
CFLAGS="-no-cpp-precomp $CFLAGS"
AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp)
;;
*)
AC_MSG_RESULT(none needed)
;;
esac
else
#
# Not GCC - assume it's the vendor's compiler.
#
case "$host_os" in
hpux*)
#
# HP's ANSI C compiler; flags suggested by Jost Martin.
# "-Ae" for ANSI C plus extensions such as "long long".
# "+O2", for optimization. XXX - works with "-g"?
#
CFLAGS="-Ae +O2 $CFLAGS"
AC_MSG_RESULT(HP ANSI C compiler - added -Ae +O2)
;;
darwin*)
#
# It may be called "cc", but it's really a GCC derivative
# with a problematic special precompiler and precompiled
# headers; turn off the special precompiler, as some
# apparently-legal code won't compile with its precompiled
# headers.
#
CFLAGS="-no-cpp-precomp $CFLAGS"
AC_MSG_RESULT(Apple GCC - added -no-cpp-precomp)
;;
*)
AC_MSG_RESULT(none needed)
;;
esac
fi
#
# Add any platform-specific linker flags needed.
#
AC_MSG_CHECKING(for platform-specific linker flags)
case "$host_os" in
darwin*)
#
# Add -Wl,-single_module to the LDFLAGS used with shared
# libraries, to fix some error that show up in some cases;
# some Apple documentation recommends it for most shared
# libraries.
#
LDFLAGS_SHAREDLIB="-Wl,-single_module"
#
# Add -Wl,-search_paths_first to make sure that if we search
# directories A and B, in that order, for a given library, a
# non-shared version in directory A, rather than a shared
# version in directory B, is chosen (so we can use
# --with-pcap=/usr/local to force all programs to be linked
# with a static version installed in /usr/local/lib rather than
# the system version in /usr/lib).
#
LDFLAGS="-Wl,-search_paths_first $LDFLAGS"
AC_MSG_RESULT([Apple linker - added -Wl,-single_module and -Wl,-search_paths_first])
;;
cygwin*)
#
# Shared libraries in cygwin/Win32 must never contain
# undefined symbols.
#
LDFLAGS="$LDFLAGS -no-undefined"
AC_MSG_RESULT(CygWin GNU ld - added -no-undefined)
;;
*)
AC_MSG_RESULT(none needed)
;;
esac
AC_SUBST(LDFLAGS_SHAREDLIB)
AC_ARG_ENABLE(profile-build,
AC_HELP_STRING( [--enable-profile-build],
[build profile-ready binaries. @<:@default=no@:>@]),
enable_profile_build=$enableval,enable_profile_build=no)
AM_CONDITIONAL(USE_PROFILE_BUILD, test x$enable_profile_build = xyes)
AC_MSG_CHECKING(if profile builds must be generated)
if test "x$enable_profile_build" = "xyes" ; then
if test "x$GCC" = "xyes" ; then
AC_MSG_RESULT(yes)
CFLAGS=" -pg $CFLAGS"
else
AC_MSG_RESULT(no)
echo "Building profile binaries currently only supported for GCC."
fi
else
AC_MSG_RESULT(no)
fi
AC_ARG_ENABLE(gtk2,
AC_HELP_STRING( [--disable-gtk2],
[build Glib1/Gtk1+-based wireshark/tshark. @<:@default=no@:>@]),
enable_gtk2=$enableval,enable_gtk2=yes)
if test "x$enable_gtk2" = "xyes" ; then
AM_PATH_GLIB_2_0(2.0.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS", , gmodule)
else
AM_PATH_GLIB(1.2.0, CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS", , gmodule)
fi
dnl Look in /usr/local for header files and libraries ?
AC_ARG_ENABLE(usr-local,
AC_HELP_STRING( [--enable-usr-local],
[look for headers and libs in /usr/local tree. @<:@default=yes@:>@]),
enable_usr_local=$enableval,enable_usr_local=yes)
AC_MSG_CHECKING(whether to use /usr/local for headers and libraries)
if test "x$enable_usr_local" = "xyes" ; then
AC_MSG_RESULT(yes)
#
# Arrange that we search for header files in "/usr/local/include",
# as various packages we use ("libpcap", "zlib") may have been installed
# under "/usr/local/include".
#
# We do this after checking for GLib, so that "-I/usr/local/include"
# comes after any "-I" flags added by "AM_PATH_GLIB"; if the user has
# installed a pre-1.2.9 version of GLib, it'd probably go under
# "/usr/local", and if they then install 1.2.9 or later without
# uninstalling the pre-1.2.9 version, 1.2.9's header files won't be
# in "/usr/local/include" (they're put in a separate directory so that
# GLib 1.2[.x] and 1.3[.x]/2.x can coexist), and if we search
# "/usr/local/include" before searching the directory "AM_PATH_GLIB"
# specifies, we may pick up headers from the older version.
#
CFLAGS="$CFLAGS -I/usr/local/include"
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
#
# Arrange that we search for libraries in "/usr/local/lib", as we'll
# be testing whether zlib has gzgets, and we need to be able to find
# zlib even if it's in "/usr/local/lib".
#
# We do this after checking for GLib; see above.
#
LDFLAGS="$LDFLAGS -L/usr/local/lib"
else
AC_MSG_RESULT(no)
fi
dnl Checks for header files
AC_HEADER_STDC
AC_CHECK_HEADERS(sys/time.h netinet/in.h unistd.h fcntl.h sys/stat.h sys/types.h)
#
# Define WS_VAR_IMPORT appropriately for declarations of external
# variables exported from dynamically-linked libraries.
#
AC_DEFINE(WS_VAR_IMPORT, extern, [Define as the string to precede external variable declarations in dynamically-linked libraries])
# We must know our byte order
AC_C_BIGENDIAN
#
# Does GLib define G_GINT64_MODIFIER?
#
AC_MSG_CHECKING([[whether glib.h defines the G_GINT64_MODIFIER macro]])
AC_COMPILE_IFELSE(
[
AC_LANG_SOURCE(
[[
#include <glib.h>
#if GTK_MAJOR_VERSION >= 2
#include <glib/gprintf.h>
#endif
#include <stdio.h>
main()
{
char strbuf[16+1];
g_snprintf(strbuf, sizeof strbuf, "%" G_GINT64_MODIFIER "x\n", (gint64)1);
}
]])
],
[
AC_MSG_RESULT(yes)
],
[
AC_MSG_RESULT(no)
AC_WIRETAP_CHECK_64BIT_FORMAT(l,
[
AC_WIRETAP_CHECK_64BIT_FORMAT(ll,
[
AC_WIRETAP_CHECK_64BIT_FORMAT(L,
[
AC_WIRETAP_CHECK_64BIT_FORMAT(q,
[
AC_MSG_ERROR([neither %lx nor %llx nor %Lx nor %qx worked on a 64-bit integer])
])
])
])
])
])
#
# Look for libpcap, so we can include <pcap.h> in libpcap.c if it's
# found.
#
# "--with-pcap" is merely done to allow the user to specify a directory
# in which to look for <pcap.h> (and so that specifying it to the
# top-level Wireshark configure script specifies it to the Wiretap
# configure script as well); we search for it regardless of whether
# "--without-pcap" was specified, as Wiretap isn't linked with it and
# there's no benefit to not looking for the header.
#
AC_ARG_WITH(pcap,
AC_HELP_STRING( [--with-pcap=DIR],
[libpcap is located in directory DIR.]),
[
if test $withval != yes -a $withval != no
then
pcap_dir=$withval
fi
],[
pcap_dir=
])
AC_WIRETAP_PCAP_CHECK
dnl zlib check
AC_MSG_CHECKING(whether to use zlib for reading compressed capture files)
AC_ARG_WITH(zlib,
AC_HELP_STRING( [--with-zlib@<:@=DIR@:>@],
[use zlib (located in directory DIR, if supplied) to read compressed data. @<:@default=yes, if present@:>@]),
[
if test $withval = no
then
want_zlib=no
elif test $withval = yes
then
want_zlib=yes
else
want_zlib=yes
zlib_dir=$withval
fi
],[
#
# Use zlib if it's present, otherwise don't.
#
want_zlib=ifpresent
zlib_dir=
])
if test "x$want_zlib" = "xno" ; then
AC_MSG_RESULT(no)
else
AC_MSG_RESULT(yes)
AC_WIRETAP_ZLIB_CHECK
if test "x$want_zlib" = "xno" ; then
AC_MSG_RESULT(zlib not found - disabling compressed capture file support)
fi
fi
AC_OUTPUT(Makefile)