dnl This file is part of the Autoconf packaging for Ethereal.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
-dnl $Id: acinclude.m4,v 1.52 2003/02/26 20:08:30 guy Exp $
+dnl $Id: acinclude.m4,v 1.79 2004/06/29 07:59:12 guy Exp $
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
# XXX - IRIX, and other OSes, may require some flag equivalent to
# "-R" here.
#
-AC_DEFUN(AC_ETHEREAL_ADD_DASH_L,
+AC_DEFUN([AC_ETHEREAL_ADD_DASH_L],
[$1="$$1 -L$2"
case "$host_os" in
solaris*)
dnl ### Checks for structure members
-AC_DEFUN(AC_ETHEREAL_STRUCT_SA_LEN,
+AC_DEFUN([AC_ETHEREAL_STRUCT_SA_LEN],
[AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_ethereal_struct_sa_len,
[AC_TRY_COMPILE([#include <sys/types.h>
#include <sys/socket.h>], [struct sockaddr s; s.sa_len;],
fi
])
+
+dnl
+dnl Check whether a given format can be used to print 64-bit integers
+dnl
+AC_DEFUN([AC_ETHEREAL_CHECK_64BIT_FORMAT],
+[
+ AC_MSG_CHECKING([whether %$1x can be used to format 64-bit integers])
+ AC_RUN_IFELSE(
+ [
+ AC_LANG_SOURCE(
+ [[
+# ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+# endif
+ #include <stdio.h>
+ #include <sys/types.h>
+
+ main()
+ {
+ u_int64_t t = 1;
+ char strbuf[16+1];
+ sprintf(strbuf, "%016$1x", t << 32);
+ if (strcmp(strbuf, "0000000100000000") == 0)
+ exit(0);
+ else
+ exit(1);
+ }
+ ]])
+ ],
+ [
+ AC_DEFINE(PRId64, "$1d", [Format for printing 64-bit signed decimal numbers])
+ AC_DEFINE(PRIo64, "$1o", [Format for printing 64-bit unsigned octal numbers])
+ AC_DEFINE(PRIx64, "$1x", [Format for printing 64-bit unsigned hexadecimal numbers])
+ AC_DEFINE(PRIu64, "$1u", [Format for printing 64-bit unsigned decimal numbers])
+ AC_MSG_RESULT(yes)
+ ],
+ [
+ AC_MSG_RESULT(no)
+ $2
+ ])
+])
+
#
# AC_ETHEREAL_IPV6_STACK
#
# By Jun-ichiro "itojun" Hagino, <itojun@iijlab.net>
#
-AC_DEFUN(AC_ETHEREAL_IPV6_STACK,
+AC_DEFUN([AC_ETHEREAL_IPV6_STACK],
[
v6type=unknown
v6lib=none
# GNU Autoconf 2.13; the comment came from there.
# Done by Guy Harris <guy@alum.mit.edu> on 2000-01-14.
#
-AC_DEFUN(AC_ETHEREAL_GETHOSTBY_LIB_CHECK,
+AC_DEFUN([AC_ETHEREAL_GETHOSTBY_LIB_CHECK],
[
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
# to get the SysV transport functions.
#
# We use "connect" because that's what AC_PATH_XTRA did.
#
-AC_DEFUN(AC_ETHEREAL_SOCKET_LIB_CHECK,
+AC_DEFUN([AC_ETHEREAL_SOCKET_LIB_CHECK],
[
# lieder@skyler.mavd.honeywell.com says without -lsocket,
# socket/setsockopt and other routines are undefined under SCO ODT
#
# AC_ETHEREAL_PCAP_CHECK
#
-AC_DEFUN(AC_ETHEREAL_PCAP_CHECK,
+AC_DEFUN([AC_ETHEREAL_PCAP_CHECK],
[
if test -z "$pcap_dir"
then
#
AC_MSG_CHECKING(for extraneous pcap header directories)
found_pcap_dir=""
- for pcap_dir in /usr/include/pcap $prefix/include/pcap $prefix/include /usr/local/include/pcap
+ pcap_dir_list="/usr/include/pcap $prefix/include/pcap $prefix/include"
+ if test "x$ac_cv_enable_usr_local" = "xyes" ; then
+ pcap_dir_list="$pcap_dir_list /usr/local/include/pcap"
+ fi
+ for pcap_dir in $pcap_dir_list
do
if test -d $pcap_dir ; then
if test x$pcap_dir != x/usr/include -a x$pcap_dir != x/usr/local/include ; then
[
PCAP_LIBS=-lpcap
AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
- ], [AC_MSG_ERROR(Library libpcap not found.)],
- $SOCKET_LIBS $NSL_LIBS)
+ ], [
+ AC_MSG_CHECKING([for pcap_open_live in -lpcap -lcfg -lodm])
+ ac_save_LIBS="$LIBS"
+ LIBS="-lpcap -lcfg -lodm"
+ AC_TRY_LINK(
+ [
+# include <pcap.h>
+ ],
+ [
+ pcap_open_live(NULL, 0, 0, 0, NULL);
+ ],
+ [
+ AC_MSG_RESULT([yes])
+ PCAP_LIBS="-lpcap -lcfg -lodm"
+ AC_DEFINE(HAVE_LIBPCAP, 1, [Define to use libpcap library])
+ ],
+ [
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Library libpcap not found.])
+ ])
+ LIBS=$ac_save_LIBS
+ ], $SOCKET_LIBS $NSL_LIBS)
AC_SUBST(PCAP_LIBS)
-])
-#
-# AC_ETHEREAL_PCAP_VERSION_CHECK
-#
-# Check whether "pcap_version" is defined by libpcap.
-#
-AC_DEFUN(AC_ETHEREAL_PCAP_VERSION_CHECK,
-[
- AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
+ #
+ # Check whether various variables and functions are defined by
+ # libpcap.
+ #
ac_save_LIBS="$LIBS"
+ AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS"
AC_TRY_LINK(
[
ac_cv_pcap_version_defined=yes,
ac_cv_pcap_version_defined=no,
[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- LIBS="$ac_save_LIBS"
if test "$ac_cv_pcap_version_defined" = yes ; then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_PCAP_VERSION, 1, [Define if libpcap version is known])
else
AC_MSG_RESULT(no)
fi
+ AC_CHECK_FUNCS(pcap_findalldevs pcap_lib_version pcap_open_dead)
+ AC_CHECK_FUNCS(pcap_datalink_val_to_name pcap_datalink_name_to_val)
+ AC_CHECK_FUNCS(pcap_list_datalinks pcap_set_datalink)
+ LIBS="$ac_save_LIBS"
])
#
# AC_ETHEREAL_ZLIB_CHECK
#
-AC_DEFUN(AC_ETHEREAL_ZLIB_CHECK,
+AC_DEFUN([AC_ETHEREAL_ZLIB_CHECK],
[
if test "x$zlib_dir" != "x"
then
#
ethereal_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I$zlib_dir/include"
- ethereal_save_CPPLAGS="$CPPLAGS"
+ ethereal_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
ethereal_save_LIBS="$LIBS"
AC_ETHEREAL_ADD_DASH_L(LIBS, $zlib_dir/lib)
# contains gzgets there.
#
CFLAGS="$ethereal_save_CFLAGS"
- CPPFLAGS="$ethereal_save_CPPLAGS"
+ CPPFLAGS="$ethereal_save_CPPFLAGS"
LIBS="$ethereal_save_LIBS"
fi
want_zlib=no
fi
])
+#
+# AC_ETHEREAL_LIBPCRE_CHECK
+#
+AC_DEFUN([AC_ETHEREAL_LIBPCRE_CHECK],
+[
+ if test "x$pcre_dir" != "x"
+ then
+ #
+ # The user specified a directory in which libpcre 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 libpcre 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.
+ #
+ ethereal_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I$pcre_dir/include"
+ ethereal_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$pcre_dir/include"
+ ethereal_save_LIBS="$LIBS"
+ LIBS="$LIBS -lpcre"
+ ethereal_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -L$pcre_dir/lib"
+ fi
+
+ #
+ # Make sure we have "pcre.h". If we don't, it means we probably
+ # don't have libpcre, so don't use it.
+ #
+ AC_CHECK_HEADER(pcre.h,,
+ [
+ if test "x$pcre_dir" != "x"
+ then
+ #
+ # The user used "--with-pcre=" to specify a directory
+ # containing libpcre, but we didn't find the header file
+ # there; that either means they didn't specify the
+ # right directory or are confused about whether libpcre
+ # is, in fact, installed. Report the error and give up.
+ #
+ AC_MSG_ERROR([libpcre header not found in directory specified in --with-pcre])
+ else
+ if test "x$want_pcre" = "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 pcre.h not found.)
+ else
+ #
+ # We couldn't find the header file; don't use the
+ # library, as it's probably not present.
+ #
+ want_pcre=no
+ fi
+ fi
+ ])
+
+ if test "x$want_pcre" != "xno"
+ then
+ #
+ # Well, we at least have the pcre header file.
+ #
+ # We're only using standard functions from libpcre,
+ # so we don't need to perform extra checks.
+ #
+ AC_CHECK_LIB(pcre, pcre_compile,
+ [
+ if test "x$pcre_dir" != "x"
+ then
+ #
+ # Put the "-I" and "-L" flags for pcre at
+ # the beginning of CFLAGS, CPPFLAGS,
+ # LDFLAGS, and LIBS.
+ #
+ PCRE_LIBS="-L$pcre_dir/lib -lpcre $ethereal_save_LIBS"
+ else
+ PCRE_LIBS="-lpcre"
+ fi
+ AC_DEFINE(HAVE_LIBPCRE, 1, [Define to use libpcre library])
+ ],[
+ if test "x$pcre_dir" != "x"
+ then
+ #
+ # Restore the versions of CFLAGS, CPPFLAGS,
+ # LDFLAGS, and LIBS before we added the
+ # "--with-pcre=" directory, as we didn't
+ # actually find pcre there.
+ #
+ CFLAGS="$ethereal_save_CFLAGS"
+ CPPFLAGS="$ethereal_save_CPPFLAGS"
+ LDFLAGS="$ethereal_save_LDFLAGS"
+ LIBS="$ethereal_save_LIBS"
+ PCRE_LIBS=""
+ fi
+ want_pcre=no
+ ])
+ AC_SUBST(PCRE_LIBS)
+ fi
+])
+
#
# AC_ETHEREAL_UCDSNMP_CHECK
#
-AC_DEFUN(AC_ETHEREAL_UCDSNMP_CHECK,
+AC_DEFUN([AC_ETHEREAL_UCDSNMP_CHECK],
[
if test "x$ucdsnmp_dir" != "x"
then
fi
#
- # Check for the UCD SNMP header file, to see whether we
- # have UCD SNMP installed.
+ # Check for one of the UCD SNMP header files we include,
+ # to see whether we have UCD SNMP installed.
#
- AC_CHECK_HEADER(ucd-snmp/snmp.h,
+ AC_CHECK_HEADER(ucd-snmp/ucd-snmp-config.h,
[
#
- # UCD SNMP may require "-lkstat" on Solaris, sigh.
+ # UCD SNMP or Net-SNMP might require various helper
+ # libraries on various platforms, such as "-ldes425"
+ # in "/usr/kerberos/lib" on some versions of Red
+ # Hat Linux, or "-lkstat" on Solaris.
# XXX - it may also require "-lcrypto" on some platforms;
# we should check for that as well, rather than requiring
# users to explicitly indicate whether it's required.
#
- AC_CHECK_LIB(snmp, sprint_realloc_objid,
- SNMP_LIBS=-lsnmp,
- [
- #
- # Throw away the cached "we didn't find it" answer.
- #
- unset ac_cv_lib_snmp_sprint_realloc_objid
- AC_CHECK_LIB(snmp, sprint_realloc_objid,
- [
- #
- # Throw away the cached "we found it" answer, so
- # that if we rerun "configure", we don't just blow
- # off this check and blithely assume that we don't
- # need "-lkstat".
- #
- # XXX - autoconf really needs a way to test for
- # a given routine in a given library *and* to test
- # whether additional "-L"/"-R"/whatever flags are
- # needed *before* the "-l" flag for the library
- # and to test whether additional libraries are
- # needed after the library *and* to cache all that
- # information.
- #
- unset ac_cv_lib_snmp_sprint_realloc_objid
- SNMP_LIBS="-lsnmp -lkstat"
- ],,$SOCKET_LIBS $NSL_LIBS $SSL_LIBS -lkstat
- )
- ], $SOCKET_LIBS $NSL_LIBS $SSL_LIBS
- )
+ # XXX - autoconf really needs a way to test for
+ # a given routine in a given library *and* to test
+ # whether additional "-L"/"-R"/whatever flags are
+ # needed *before* the "-l" flag for the library
+ # and to test whether additional libraries are
+ # needed after the library *and* to cache all that
+ # information.
+ #
+ for extras in "" "-L/usr/kerberos/lib -ldes425" "-lkstat"
+ do
+ AC_CHECK_LIB(snmp, sprint_realloc_objid,
+ [
+ SNMP_LIBS="-lsnmp $extras"; break
+ ],
+ [
+ #
+ # Throw away the cached "we didn't find it"
+ # answer, so that if we rerun "configure",
+ # we still do all these checks and don't
+ # just blithely assume we don't need
+ # the extra libraries.
+ #
+ unset ac_cv_lib_snmp_sprint_realloc_objid
+ ], $SOCKET_LIBS $NSL_LIBS $SSL_LIBS $extras)
+ done
#
# If we didn't find "sprint_realloc_objid()", fail.
#
# AC_ETHEREAL_SSL_CHECK
#
-AC_DEFUN(AC_ETHEREAL_SSL_CHECK,
+AC_DEFUN([AC_ETHEREAL_SSL_CHECK],
[
want_ssl=defaultyes
AC_ARG_WITH(ssl,
- [ --with-ssl=DIR use SSL crypto library, located in directory DIR.], [
+changequote(<<, >>)dnl
+<< --with-ssl[=DIR] use SSL crypto library (located in directory DIR, if supplied). [default=yes, if present]>>,
+changequote([, ])dnl
+ [
if test "x$withval" = "xno"; then
want_ssl=no
elif test "x$withval" = "xyes"; then
# AC_ETHEREAL_RPM_CHECK
# Looks for the rpm program, and checks to see if we can redefine "_topdir".
#
-AC_DEFUN(AC_ETHEREAL_RPM_CHECK,
+AC_DEFUN([AC_ETHEREAL_RPM_CHECK],
[
AC_CHECK_PROG(ac_cv_ethereal_have_rpm, rpm, "yes", "no")
if test "x$ac_cv_ethereal_have_rpm" = "xyes"; then
HAVE_GNU_SED=no
fi
])
+
+#
+# AC_ETHEREAL_ADNS_CHECK
+#
+AC_DEFUN([AC_ETHEREAL_ADNS_CHECK],
+[
+ want_adns=defaultyes
+
+ AC_ARG_WITH(adns,
+changequote(<<, >>)dnl
+<< --with-adns[=DIR] use GNU ADNS (located in directory DIR, if supplied). [default=yes, if present]>>,
+changequote([, ])dnl
+ [
+ if test "x$withval" = "xno"; then
+ want_adns=no
+ elif test "x$withval" = "xyes"; then
+ want_adns=yes
+ elif test -d "$withval"; then
+ want_adns=yes
+ AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+ fi
+ ])
+
+ if test "x$want_adns" = "xdefaultyes"; then
+ want_adns=yes
+ withval=/usr/local
+ if test -d "$withval"; then
+ AC_ETHEREAL_ADD_DASH_L(LDFLAGS, ${withval}/lib)
+ fi
+ fi
+
+ if test "x$want_adns" = "xyes"; then
+ AC_CHECK_LIB(adns, adns_init,
+ [
+ ADNS_LIBS=-ladns
+ AC_DEFINE(HAVE_GNU_ADNS, 1, [Define to use GNU ADNS library])
+ have_good_adns=yes
+ ],, $SOCKET_LIBS $NSL_LIBS
+ )
+ else
+ AC_MSG_RESULT(not required)
+ fi
+])
+
+
+#
+# AC_ETHEREAL_KRB5_CHECK
+#
+AC_DEFUN([AC_ETHEREAL_KRB5_CHECK],
+[
+ if test "x$krb5_dir" != "x"
+ then
+ #
+ # The user specified a directory in which kerberos 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 kerberos 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.
+ #
+ ethereal_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I$krb5_dir/include"
+ ethereal_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
+ #ethereal_save_LIBS="$LIBS"
+ #LIBS="$LIBS -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lresolv"
+ KRB5_LIBS="-lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lresolv"
+ ethereal_save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -L$krb5_dir/lib"
+ ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
+ else
+ AC_PATH_PROG(KRB5_CONFIG, krb5-config)
+ if test -x "$KRB5_CONFIG"
+ then
+ KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
+ CFLAGS="$CFLAGS $KRB5_FLAGS"
+ CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
+ KRB5_LIBS=`"$KRB5_CONFIG" --libs`
+ # Looks like krb5-config is lacking -lresolv on some systems
+ AC_MSG_CHECKING(whether library list looks OK)
+ if echo "$KRB5_LIBS" | grep resolv >/dev/null
+ then
+ AC_MSG_RESULT(yes)
+ else
+ KRB5_LIBS="$KRB5_LIBS -lresolv"
+ AC_MSG_RESULT(Adding -lresolv to libs)
+ fi
+
+ #LIBS="$LIBS $KRB5_LIBS"
+ ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
+ fi
+ fi
+
+ #
+ # Make sure we have "krb5.h". If we don't, it means we probably
+ # don't have kerberos, so don't use it.
+ #
+ AC_CHECK_HEADER(krb5.h,,
+ [
+ if test "x$krb5_dir" != "x"
+ then
+ #
+ # The user used "--with-krb5=" to specify a directory
+ # containing kerberos, but we didn't find the header file
+ # there; that either means they didn't specify the
+ # right directory or are confused about whether kerberos
+ # is, in fact, installed. Report the error and give up.
+ #
+ AC_MSG_ERROR([kerberos header not found in directory specified in --with-krb5])
+ else
+ if test "x$want_krb5" = "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 krb5.h not found.)
+ else
+ #
+ # We couldn't find the header file; don't use the
+ # library, as it's probably not present.
+ #
+ want_krb5=no
+ fi
+ fi
+ ])
+
+ if test "x$want_krb5" != "xno" -a "x$ac_krb5_version" = "xHEIMDAL"
+ then
+ #
+ # Well, we at least have the krb5 header file.
+ #
+ AC_CHECK_LIB(krb5, krb5_kt_resolve,
+ [
+ if test "x$krb5_dir" != "x"
+ then
+ #
+ # Put the "-I" and "-L" flags for krb5 at
+ # the beginning of CFLAGS, CPPFLAGS,
+ # LDFLAGS, and LIBS.
+ #
+ KRB5_LIBS="-L$krb5_dir/lib $KRB5_LIBS"
+ fi
+ AC_DEFINE(HAVE_KERBEROS, 1, [Define to use kerberos])
+ AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, [Define to use heimdal kerberos])
+ ],[
+ if test "x$krb5_dir" != "x"
+ then
+ #
+ # Restore the versions of CFLAGS, CPPFLAGS,
+ # LDFLAGS, and LIBS before we added the
+ # "--with-krb5=" directory, as we didn't
+ # actually find kerberos there.
+ #
+ CFLAGS="$ethereal_save_CFLAGS"
+ CPPFLAGS="$ethereal_save_CPPFLAGS"
+ LDFLAGS="$ethereal_save_LDFLAGS"
+ #LIBS="$ethereal_save_LIBS"
+ KRB5_LIBS=""
+ fi
+ want_krb5=no
+ ], $KRB5_LIBS)
+ else
+ KRB5_LIBS=""
+ want_krb5=no
+ fi
+ AC_SUBST(KRB5_LIBS)
+])
+
git.samba.org / obnox / wireshark / wip.git / blobdiff