[
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(PRIx64, "$1x", [Format for printing 64-bit unsigned hexadecimal numbers (lower-case)])
+ AC_DEFINE(PRIX64, "$1X", [Format for printing 64-bit unsigned hexadecimal numbers (upper-case)])
AC_DEFINE(PRIu64, "$1u", [Format for printing 64-bit unsigned decimal numbers])
AC_MSG_RESULT(yes)
],
else
AC_MSG_RESULT(no)
fi
- AC_CHECK_FUNCS(pcap_open_dead)
+ AC_CHECK_FUNCS(pcap_open_dead pcap_freecode)
#
# Later versions of Mac OS X 10.3[.x] ship a pcap.h that
# doesn't define pcap_if_t but ship an 0.8[.x] libpcap,
[Define to 1 if you have the `pcap_findalldevs' function and a pcap.h that declares pcap_if_t.])
AC_CHECK_FUNCS(pcap_datalink_val_to_name pcap_datalink_name_to_val)
AC_CHECK_FUNCS(pcap_list_datalinks pcap_set_datalink pcap_lib_version)
+ AC_CHECK_FUNCS(pcap_get_selectable_fd)
fi
LIBS="$ac_save_LIBS"
])
fi
])
+#
+# AC_ETHEREAL_NETSNMP_CHECK
+#
+AC_DEFUN([AC_ETHEREAL_NETSNMP_CHECK],
+[
+ dnl get the net-snmp-config binary
+ if test "x$netsnmpconfig" = "x" ; then
+ #
+ # The user didn't specify where net-snmp-config is
+ # located; search for it.
+ #
+ AC_PATH_PROG(NETSNMPCONFIG, net-snmp-config)
+ else
+ NETSNMPCONFIG=$netsnmpconfig
+ if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
+ NETSNMPCONFIG=$netsnmpconfig/bin/net-snmp-config
+ if test ! -x $NETSNMPCONFIG -o ! -f $NETSNMPCONFIG ; then
+ AC_MSG_ERROR(Invalid net-snmp-config: $netsnmpconfig)
+ fi
+ fi
+ fi
+
+ #
+ # XXX - check whether $NETSNMPCONFIG is executable?
+ # if test "x$NETSNMPCONFIG" != "xno" -a "x$NETSNMPCONFIG" != "x" -a -x "$NETSNMPCONFIG" ; then
+ # We already did that if it was set; presumably AC_PATH_PROG
+ # will fail if it doesn't find an executable version.
+ #
+ if test "x$NETSNMPCONFIG" != "x" ; then
+ dnl other choices for flags to use here: could also use
+ dnl --prefix or --exec-prefix if you don't want the full list.
+
+ #
+ # Save the current settings of CFLAGS and CPPFLAGS, and add
+ # the output of "$NETSNMPCONFIG --cflags" to it, so that when
+ # searching for the Net-SNMP headers, we look in whatever
+ # directory that output specifies.
+ #
+ ethereal_save_CFLAGS="$CFLAGS"
+ ethereal_save_CPPFLAGS="$CPPFLAGS"
+ CFLAGS="$CFLAGS `$NETSNMPCONFIG --cflags`"
+ CPPFLAGS="$CPPFLAGS `$NETSNMPCONFIG --cflags`"
+
+ AC_CHECK_HEADERS(net-snmp/net-snmp-config.h net-snmp/library/default_store.h)
+ if test "x$ac_cv_header_net_snmp_net_snmp_config_h" = "xyes" -a "x$ac_cv_header_net_snmp_library_default_store_h" = "xyes" ; then
+ SNMP_LIBS=`$NETSNMPCONFIG --libs`
+ if echo "$SNMP_LIBS" | grep crypto >/dev/null && test "x$SSL_LIBS" = "x"; then
+ if test "x$want_netsnmp" = "xyes" ; then
+ AC_MSG_ERROR(Net-SNMP requires openssl but ssl not enabled)
+ else
+ AC_MSG_RESULT(Net-SNMP requires openssl but ssl not enabled - disabling Net-SNMP)
+ fi
+ CFLAGS="$ethereal_save_CFLAGS"
+ CPPFLAGS="$ethereal_save_CPPFLAGS"
+ SNMP_LIBS=
+ else
+ AC_DEFINE(HAVE_NET_SNMP, 1, [Define to enable support for Net-SNMP])
+ have_net_snmp="yes"
+ fi
+ else
+ if test "x$want_netsnmp" = "xyes" ; then
+ AC_MSG_ERROR(Net-SNMP not found)
+ else
+ #
+ # Restore the versions of CFLAGS and
+ # CPPFLAGS before we added the output
+ # of '$NETSNMPCONFIG --cflags", as we
+ # didn't actually find Net-SNMP there.
+ #
+ CFLAGS="$ethereal_save_CFLAGS"
+ CPPFLAGS="$ethereal_save_CPPFLAGS"
+ fi
+ fi
+ fi
+])
+
#
# AC_ETHEREAL_UCDSNMP_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
#
CFLAGS="$CFLAGS -I$krb5_dir/include"
CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
- KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt"
- ac_krb5_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
+ ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
+ ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+ ac_krb5_version="$ac_heimdal_version$ac_mit_version"
+ if test "x$ac_krb5_version" = "xHEIMDAL"
+ KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt"
+ then
+ KRB5_LIBS="-L$krb5_dir/lib -lkrb5 -lk5crypto -lcom_err"
+ fi
+ if test "x$ac_krb5_version" = "xMIT"
+ then
+ AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
+ fi
else
AC_PATH_PROG(KRB5_CONFIG, krb5-config)
if test -x "$KRB5_CONFIG"
KRB5_LIBS=`"$KRB5_CONFIG" --libs`
CFLAGS="$CFLAGS $KRB5_FLAGS"
CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
- KRB5_LIBS=`"$KRB5_CONFIG" --libs`
#
# If -lcrypto is in KRB5_FLAGS, we require it to build
- # with Heimdal. We don't want to built with it by
+ # with Heimdal/MIT. We don't want to built with it by
# default, due to annoying license incompatibilities
# between the OpenSSL license and the GPL, so:
#
fi
;;
esac
- ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
+ ac_krb5_version=`"$KRB5_CONFIG" --version | head -n 1 | sed -e 's/^.*heimdal.*$/HEIMDAL/' -e 's/^Kerberos .*$/MIT/'`
fi
fi
# library, as it's probably not present.
#
want_krb5=no
- AC_MSG_RESULT(Heimdal header not found - disabling dissection for some kerberos data in packet decoding)
+ AC_MSG_RESULT(No Heimdal or MIT header found - disabling dissection for some kerberos data in packet decoding)
fi
fi
])
then
#
# Well, we at least have the krb5 header file.
- # Check whether this is Heimdal.
+ # Check whether this is Heimdal or MIT.
#
- AC_MSG_CHECKING(whether the Kerberos library is Heimdal)
- if test "x$ac_krb5_version" = "xHEIMDAL"
+ AC_MSG_CHECKING(whether the Kerberos library is Heimdal or MIT)
+ if test "x$ac_krb5_version" = "xHEIMDAL" -o "x$ac_krb5_version" = "xMIT"
then
#
# Yes.
# we need to link with -lresolv when linking with
# the Kerberos library.
#
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT($ac_krb5_version)
ethereal_save_LIBS="$LIBS"
found_krb5_kt_resolve=no
for extras in "" "-lresolv"
LIBS="$KRB5_LIBS $extras"
if test -z "$extras"
then
- AC_MSG_CHECKING([whether Heimdal includes krb5_kt_resolve])
+ AC_MSG_CHECKING([whether $ac_krb5_version includes krb5_kt_resolve])
else
- AC_MSG_CHECKING([whether Heimdal includes krb5_kt_resolve (linking with $extras)])
+ AC_MSG_CHECKING([whether $ac_krb5_version includes krb5_kt_resolve (linking with $extras)])
fi
AC_TRY_LINK(
[
AC_MSG_RESULT(yes)
KRB5_LIBS="$LIBS"
AC_DEFINE(HAVE_KERBEROS, 1, [Define to use kerberos])
- AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, [Define to use heimdal kerberos])
+ if test "x$ac_krb5_version" = "xHEIMDAL"
+ then
+ AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1, [Define to use heimdal kerberos])
+ elif test "x$ac_krb5_version" = "xMIT"
+ then
+ AC_DEFINE(HAVE_MIT_KERBEROS, 1, [Define to use MIT kerberos])
+ fi
found_krb5_kt_resolve=yes
break
],
# The user tried to force us to use the library,
# but we can't do so; report an error.
#
- AC_MSG_ERROR(Usable Heimdal not found)
+ AC_MSG_ERROR(Usable $ac_krb5_version not found)
else
#
# Restore the versions of CFLAGS and CPPFLAGS
# from before we added the flags for Kerberos.
#
- AC_MSG_RESULT(Usable Heimdal not found - disabling dissection for some kerberos data in packet decoding)
+ AC_MSG_RESULT(Usable $ac_krb5_version not found - disabling dissection for some kerberos data in packet decoding)
CFLAGS="$ethereal_save_CFLAGS"
CPPFLAGS="$ethereal_save_CPPFLAGS"
KRB5_LIBS=""
want_krb5=no
fi
+ else
+ #
+ # We can link with Kerberos; see whether krb5.h
+ # defines KEYTYPE_ARCFOUR_56 (where "defines" means
+ # "as a #define or as an enum member).
+ #
+ AC_MSG_CHECKING([whether krb5.h defines KEYTYPE_ARCFOUR_56])
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_SOURCE(
+ [[
+ #include <krb5.h>
+ #include <stdio.h>
+
+ main()
+ {
+ printf("%u\n", KEYTYPE_ARCFOUR_56);
+ }
+ ]])
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_KEYTYPE_ARCFOUR_56, 1, [Define if krb5.h defines KEYTYPE_ARCFOUR_56])
+ ],
+ [
+ AC_MSG_RESULT(no)
+ ])
fi
LIBS="$ethereal_save_LIBS"
else
#
- # It's not Heimdal.
+ # It's not Heimdal or MIT.
#
AC_MSG_RESULT(no)
if test "x$want_krb5" = "xyes"
# The user tried to force us to use the library,
# but we can't do so; report an error.
#
- AC_MSG_ERROR(Heimdal not found)
+ AC_MSG_ERROR(Kerberos not found)
else
#
# Restore the versions of CFLAGS and CPPFLAGS
# from before we added the flags for Kerberos.
#
- AC_MSG_RESULT(Heimdal not found - disabling dissection for some kerberos data in packet decoding)
+ AC_MSG_RESULT(Kerberos not found - disabling dissection for some kerberos data in packet decoding)
CFLAGS="$ethereal_save_CFLAGS"
CPPFLAGS="$ethereal_save_CPPFLAGS"
KRB5_LIBS=""
fi
AC_SUBST(KRB5_LIBS)
])
-
git.samba.org / obnox / wireshark / wip.git / blobdiff