Commit Graph

102 Commits

Author SHA1 Message Date
Jörg Mayer d18c4821e2 At least on Suse, the linking flags are obtained via krb5-config --libs,
not --cflags.

svn path=/trunk/; revision=12147
2004-09-30 07:14:18 +00:00
Guy Harris 54e48e1dbf Use the right name in the Checking... messages.
svn path=/trunk/; revision=12137
2004-09-29 17:45:48 +00:00
Guy Harris 46ba180b03 Put back the $KRB4_CONFIG call to set KRB5_LIBS.
svn path=/trunk/; revision=12136
2004-09-29 17:38:53 +00:00
Guy Harris 649ecd7e8c When testing whether the Heimdal library has krb5_kt_resolve (and
whether it requires -lresolv), restore LIBS after we're done regardless
of whether we found it or not - we use KRB5_LIBS in the Makefiles,
rather than adding the Kerberos libraries to LIBS directly.

svn path=/trunk/; revision=12134
2004-09-29 09:58:22 +00:00
Guy Harris 9d71c8da5b If, when checking whether the Kerberos library is Heimdal or not, we
find it's not, always report "no", even if we're going to give up
because the user specified --with-krb5, so the "sorry, you don't have
Heimdal" message shows up on a line of its own.

svn path=/trunk/; revision=12119
2004-09-28 04:47:10 +00:00
Guy Harris 242499c091 If the user specified --with-krb5 but we don't have a usable Kerberos
library, don't disable dissection and drive on, report an error and
stop; --with-krb5 means "build this with Kerberos", not "build this with
Kerberos if you can" (no -krb5 option at all means "build this with
Kerberos if you can").

If they *didn't* specify --with-krb5 and we don't have a usable Kerberos
library, set want_krb5 to "no", so that at the end of the configure
script we don't say we're building with the Kerberos library (otherwise,
want_krb5 is "ifpresent", but the stuff to print the configuration
options treats anything other than "no" as meaning "yes").

svn path=/trunk/; revision=12118
2004-09-28 04:41:57 +00:00
Guy Harris f62467ec34 Explicitly indicate when we're doing tests to see if UCD SNMP contains
sprint_realloc_objid(), and the extra libraries we're using with the
tests, along the lines of what we do with the Kerberos 5 library.

svn path=/trunk/; revision=12108
2004-09-26 22:30:46 +00:00
Guy Harris f3381337cc In the SNMP tests, we're using AC_TRY_LINK to avoid caching the results
of the test for sprint_realloc_objid() (so that a failure to find it
when we're not linking with extra libraries doesn't cause us to assume
we won't find it if we *do* link with extra libraries), so
"ac_cv_lib_snmp_sprint_realloc_objid" doesn't get set - set our own
variable for that.

Use AC_TRY_LINK rather than AC_CHECK_LIB in the Kerberos tests when
checking for krb_k5_resolve(), to avoid caching the results.

Improve the messages printed in the Kerberos tests to give more detail.

svn path=/trunk/; revision=12106
2004-09-26 20:30:44 +00:00
Guy Harris aa580a0cca Clean up a bunch of cruft in --with-ssl; make it more resemble other
--with flags.

Report, in the messages at the end of the configure script, whether
we're building with the SSL library.

If we fail to find "sprint_realloc_objid()" when linking with a
particular library, and --with-ssl wasn't specified, try linking with
-lcrypto as well and, if that succeeds, fail with an indication that UCD
SNMP requires -lcrypto but --with-ssl wasn't specified.

svn path=/trunk/; revision=12105
2004-09-26 04:00:20 +00:00
Guy Harris 64124c3adb Explicitly test whether we need -lresolv in order to link with -lkrb5.
Include -lresolv if we do, and don't include it if we don't.

Clean up some other things in the -lkrb5 macro.

svn path=/trunk/; revision=12104
2004-09-26 00:26:06 +00:00
Guy Harris b1bde8fe6a For annoying licensing reasons, we don't want to use -lcrypto unless the
user explicitly says to do so by using --with-ssl.  However, we *still*
don't want to just blithely replace -lcrypto with SSL_LIBS, so, if
KRB5_LIBS contains "-lcrypto" but SSL_LIBS isn't set to a non-empty
string, we report an error (the user can than either configure without
Kerberos or with -lcrypto).

svn path=/trunk/; revision=12103
2004-09-25 23:58:42 +00:00
Guy Harris d0842822ad Don't just add "-lresolv" to KRB5_LIBS if it's missing - on some
platforms, it's missing because it's not needed, which is good because
it's not even *present* on those platforms (the resolver functions are
built into libc).  If there really are platforms where krb5-config is
broken to the extent that it doesn't list -lresolv when it's required,
the way to fix that is to try building a program with Heimdal and just
the krb5-config libraries and, if that fails, try building with those
libraries and -lresolv - if that works, add -lresolv to the list of
libraries.

Don't just replace -lcrypto with SSL_LIBS in KRB5_LIBS, as SSL_LIBS
might not contain any libraries - replace it only if SSL_LIBS is defined
as something.

svn path=/trunk/; revision=12099
2004-09-25 09:33:53 +00:00
Guy Harris cdb4a5f4d5 From Marten Svantesson: according to Tomas Anders, all versions of Heimdal
will either have "heimdal", in all lower case, in the version string in
the header file, or will write out, when you run "krb5-config
--version", a version string with "heimdal" in all lower case, so we
don't need to do case-insensitive matching, which is good - not all
versions of "sed" support the "i" flag (although you can do
case-insensitive matching by using regular expressions, if necessary).

svn path=/trunk/; revision=11915
2004-09-06 19:49:54 +00:00
Guy Harris f7190ff4c7 Fix a typo.
svn path=/trunk/; revision=11747
2004-08-16 02:23:41 +00:00
Guy Harris 334a55a2ce For "pcap_findalldevs()", don't assume that just because it's in -lpcap
it's usable - one of the updates to OS X 10.3 updated libpcap to
0.8[.x], so that it had "pcap_findalldevs()", but didn't update
"pcap.h", so it didn't declare "pcap_if_t", so you couldn't actually
*use* it.  You can work around that by installing the pcap.h (and
pcap-bpf.h) from the matching tcpdump.org release, but, as even when
that version of OS X is pre-installed rather than being the result of a
Software Update, you still don't get the new "pcap.h" (at least I didn't
get it on my PowerBook with 10.3.4).  Therefore, we check whether a
program that calls "pcap_findalldevs()" *and* declares a "pcap_if_t *"
to pass to it can be compiled and linked with -lpcap, and only declare
HAVE_PCAP_FINDALLDEVS if we can.

Also, don't check for the functions added to libpcap after
"pcap_findalldevs()" was added unless we have a usable
"pcap_findalldevs()", as, if not, those functions won't be declared in
"pcap.h" either, so we'll get compiler warnings.

svn path=/trunk/; revision=11745
2004-08-16 01:11:23 +00:00
Guy Harris 809bd53e81 Use the GLib gint64 and guint64 types instead of u_int64_t or uint64_t,
as those are what's used in Ethereal for 64-bit integers, and as there's
no guarantee that either of them will be defined on any particular
platform.

svn path=/trunk/; revision=11513
2004-07-25 08:36:34 +00:00
Jörg Mayer 2d21f054ef Remove set -/+x - they were added for debugging and not intended for commit
svn path=/trunk/; revision=11493
2004-07-23 23:34:15 +00:00
Jörg Mayer 769507d234 Fix the fix to krb5
svn path=/trunk/; revision=11465
2004-07-21 22:37:04 +00:00
Jörg Mayer 6ecefef982 Forgotten case: Make krb5 fail if it requires -lcrypto but no --with-ssl=... is not given
svn path=/trunk/; revision=11458
2004-07-21 17:45:05 +00:00
Guy Harris 5dca1e794c As Joerg Mayer noted, the value of LIBS should be saved outside the
loop.

svn path=/trunk/; revision=11444
2004-07-20 18:42:28 +00:00
Guy Harris 84479319ad When checking whether we can get "sprint_realloc_objid()" from the SNMP
library, don't forget to link with the SNMP library along with all the
other libraries....

Restore the setting of LIBS after doing all the tests, as is done in
other macros.

svn path=/trunk/; revision=11426
2004-07-19 02:07:07 +00:00
Jörg Mayer dd99d1eb50 - Require --with-ssl=... to be explicitly set to work
around licensing problems
- Cause krb5 and snmp to fail, if ssl is required but
  not configured.

svn path=/trunk/; revision=11416
2004-07-18 20:33:54 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Guy Harris 55676422a2 If we can't find the krb5 header or the krb5 code isn't Heimdal, clear
out KRB5_LIBS, so we don't try to link with the library.

svn path=/trunk/; revision=11267
2004-06-29 07:59:12 +00:00
Jörg Mayer 36d8f00cdb Get rid of a warning with newer auto... tools by proper quoting.
svn path=/trunk/; revision=11237
2004-06-25 07:06:46 +00:00
Guy Harris 7002776572 Pick up the stuff I did for tcpdump to figure out the right strings to
use to format 64-bit integers.

Fix the RSVP dissector to use that rather than hardcoding "%ll" in.

Remove the "only if G_HAVE_GINT64 is defined" bit from the discussion of
64-bit integers - we're too dependent on having them to support
compilers that don't have a 64-bit integral data type.  Do, however,
note that neither "long" nor "long long" are acceptable, and also note
that you shouldn't assume "%ll" does the trick for printing them.

svn path=/trunk/; revision=11182
2004-06-19 00:07:23 +00:00
Jörg Mayer 4890aefdfe Thomas Anders: Pathnames might contain Spaces, krb5-config might not be in PATH
svn path=/trunk/; revision=10918
2004-05-18 11:11:37 +00:00
Jörg Mayer 161d88c50a Thomas Anders: Add the actual libs to link in case --with-krb5=/explicit/path
svn path=/trunk/; revision=10891
2004-05-14 10:33:00 +00:00
Jörg Mayer 47b8d71aec Fix --with-krb5 when given a directory
svn path=/trunk/; revision=10881
2004-05-13 22:09:52 +00:00
Jörg Mayer 633f3242ba Thomas Anders: Don't add library paths twice
svn path=/trunk/; revision=10872
2004-05-13 16:57:43 +00:00
Olivier Biot c05bcd7c28 More correct implementation of the --disable-usr-local option.
svn path=/trunk/; revision=10661
2004-04-22 20:02:58 +00:00
Jörg Mayer 9c83306a7e Some aclocal warning fixes during autogen.sh
svn path=/trunk/; revision=10507
2004-03-27 12:07:57 +00:00
Jörg Mayer 1e1de04ffc Workaround for (at least) some RedHat platforms:
Add -lresolv in case it's missing but required by the heimdal libs.

svn path=/trunk/; revision=10420
2004-03-20 10:32:02 +00:00
Jörg Mayer 9920ca9112 Experimental Heimdal Kerberos detection.
As this is experimental and does not yet work reliably this feature is
off by default. Enable it by using --with-krb5 during configure.
Please do not yet make use of this feature (i.e. please do not *use* the
defines provided by this option), until it has received further testing
and fixing.
Please run and check what the configure says.

svn path=/trunk/; revision=10395
2004-03-17 18:20:58 +00:00
Guy Harris 7300c4ef12 From Albert Chin: libpcap 0.8.1 loads the BPF driver on AIX, but to do
so it requires routines from -lcfg and -lodm - if attempting to link
with libpcap fails, try linking with libpcap and -lcfg and -lodm and, if
that succeeds, add all those libraries to the link list.

svn path=/trunk/; revision=10244
2004-02-26 09:39:43 +00:00
Guy Harris e3753d3d58 The GNU ADNS library requires whatever libraries are needed for socket
calls.

svn path=/trunk/; revision=9352
2003-12-19 01:36:01 +00:00
Guy Harris 7725f5e92d "pcap_compile_nopcap()" has a different signature in recent NetBSD
libpcap than in tcpdump.org libpcap; it's been deprecated for that
reason.  "pcap_open_dead()" has been in libpcap since 0.6, so only for
0.5[.x] will you have "pcap_compile_nopcap()" but not "pcap_open_dead()"
- for now, we use "pcap_open_dead()" rather than
"pcap_compile_nopcap()", and don't do the check for capture filters in
systems with libpcaps that lack "pcap_open_dead()".

svn path=/trunk/; revision=9341
2003-12-18 02:46:45 +00:00
Guy Harris 8b7cf57054 From Albert Chin: fix for the following:
The PCRE test in acinclude.m4 and epan/acinclude.m4 don't work
	if PCRE exists in a non-system directory.  The problem is that
	LDFLAGS and LIBS are set incorrectly.  LIBS shouldn't contain -L
	arguments.

svn path=/trunk/; revision=9309
2003-12-17 02:36:56 +00:00
Guy Harris 585ab5ab2d Fix some typoes in variable names.
svn path=/trunk/; revision=9302
2003-12-16 22:55:28 +00:00
Gilbert Ramirez 55a6251e7c From Olivier Biot
New "matches" operater in display filter language. Uses PCRE.

If a "matches" operator is found in a dfilter
while libpcre has not been used to build the binary, then an
exception is thrown after using dfilter_fail() to set an apporporiate
error message.

svn path=/trunk/; revision=9182
2003-12-06 16:35:20 +00:00
Guy Harris 219b6cefa2 Based on a patch from Brian Fundakowski Feldman, add support for setting
link-layer type when capturing, using the "pcap_set_datalink()" and
related APIs.

svn path=/trunk/; revision=8848
2003-11-01 02:30:18 +00:00
Guy Harris 00c3a29030 Do the tests for various extra "-L" and "-l" flags that might be needed
with "-lsnmp" in a loop; this fixes up the configure script's operation
on Solaris.

svn path=/trunk/; revision=8687
2003-10-14 07:36:39 +00:00
Guy Harris a3d8b3481f Not all versions of libpcap have "pcap_compile_nopcap()"; use it only if
we have it.

Not all versions of libpcap have DLT_LINUX_SLL, either; use DLT_EN10MB
instead.

svn path=/trunk/; revision=8670
2003-10-10 21:13:21 +00:00
Guy Harris 6670a92e85 From Brad Hards: fix two problems:
1. the --without-adns case wasn't handled correctly;

	2.  the reporting at the end of the configure didn't deal with
	the case were the configure check failed (as in my example,
	where I only had the libadns package installed, not
	libadns-devel) - it reported that ADNS would be used.

svn path=/trunk/; revision=8663
2003-10-10 10:12:18 +00:00
Guy Harris 8e51328bc2 Get the version number of the libpcap/WinPcap with which we're running
with "pcap_lib_version()", if available.

svn path=/trunk/; revision=8656
2003-10-10 06:05:48 +00:00
Guy Harris de7bbaf8da Use "pcap_findalldevs()" if present.
svn path=/trunk/; revision=8655
2003-10-10 03:04:38 +00:00
Richard Sharpe 3d6f1d76e7 Add support for building with ucd-snmp on RH9.0. We need to link with
-L/usr/kerberos/lib -ldes425 ...

This works on Linux (RH 9.0) but I am not sure about Solaris. Solaris is
such a difficult environment to work with compared to Linux or FreeBSD.

svn path=/trunk/; revision=8325
2003-08-31 22:08:57 +00:00
Guy Harris cd017c62ab Note that the "=DIR" argument to "--with-ssl" and "--with-adns" is
optional.

svn path=/trunk/; revision=8200
2003-08-21 07:13:54 +00:00
Gerald Combs 1d9b54fc07 Add support for asynchronous DNS updates using the GNU ADNS library.
Support can be enabled at configure time by using "--with-adns=DIR".
If support is enabled, async queries happen whenever host name resolution
is enabled.  Do we need a separate preference for async queries?

Currently, only IPv4 reverse queries are supported.  I can add IPv4 forward
lookup support, but I don't have any way to test IPv6 queries.

svn path=/trunk/; revision=7640
2003-05-04 18:50:56 +00:00
Guy Harris 02743108b7 Check for <ucd-snmp/ucd-snmp-config.h>, not <ucd-snmp/snmp.h> - we don't
include <ucd-snmp/snmp.h>, we incldue <ucd-snmp/ucd-snmp-config.h>, and,
at least with some UCD SNMP versions, you can't just include
<ucd-snmp/snmp.h> without including a header to typedef "oid", so you
get a warning from the configure script if it's built with autoconf 2.57
(it whines because the test program won't compile but the header exists).

svn path=/trunk/; revision=7220
2003-02-28 06:04:30 +00:00