dnl This file is part of the Autoconf packaging for Wireshark.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
-dnl $Id$
-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
dnl the Free Software Foundation; either version 2, or (at your option)
# "-R" here.
#
AC_DEFUN([AC_WIRESHARK_ADD_DASH_L],
-[$1="$$1 -L$2"
+[AX_APPEND_FLAG(-L$2, $1)
case "$host_os" in
solaris*)
- $1="$$1 -R$2"
+ AX_APPEND_FLAG(-R$2, $1)
;;
esac
])
#
-# AC_WIRESHARK_TIMEZONE_ABBREV
-#
-
-AC_DEFUN([AC_WIRESHARK_TIMEZONE_ABBREV],
-[
- AC_CACHE_CHECK([for tm_zone in struct tm],
- ac_cv_wireshark_have_tm_zone,
- [
- AC_TRY_COMPILE(
- [#include <time.h>],
- [struct tm t; t.tm_zone;],
- ac_cv_wireshark_have_tm_zone=yes,
- ac_cv_wireshark_have_tm_zone=no)
- ])
- if test $ac_cv_wireshark_have_tm_zone = yes; then
- AC_DEFINE(HAVE_TM_ZONE, 1, [Define if tm_zone field exists in struct tm])
- else
- AC_CACHE_CHECK([for tzname],
- ac_cv_wireshark_have_tzname,
- [
- AC_TRY_LINK(
-[#include <time.h>
-#include <stdio.h>],
- [printf("%s", tzname[0]);],
- ac_cv_wireshark_have_tzname=yes,
- ac_cv_wireshark_have_tzname=no)
- ])
- if test $ac_cv_wireshark_have_tzname = yes; then
- AC_DEFINE(HAVE_TZNAME, 1, [Define if tzname array exists])
- fi
- fi
-])
-
-
-#
-# AC_WIRESHARK_STRUCT_ST_FLAGS
-#
-dnl AC_STRUCT_ST_BLKSIZE extracted from the file in question,
-dnl "acspecific.m4" in GNU Autoconf 2.12, and turned into
-dnl AC_WIRESHARK_STRUCT_ST_FLAGS, which checks if "struct stat"
-dnl has the 4.4BSD "st_flags" member, and defines HAVE_ST_FLAGS; that's
-dnl what's in this file.
-dnl Done by Guy Harris <guy@alum.mit.edu> on 2012-06-02.
-
-dnl ### Checks for structure members
-
-AC_DEFUN([AC_WIRESHARK_STRUCT_ST_FLAGS],
-[AC_CACHE_CHECK([for st_flags in struct stat], ac_cv_wireshark_struct_st_flags,
-[AC_TRY_COMPILE([#include <sys/stat.h>], [struct stat s; s.st_flags;],
-ac_cv_wireshark_struct_st_flags=yes, ac_cv_wireshark_struct_st_flags=no)])
-if test $ac_cv_wireshark_struct_st_flags = yes; then
- AC_DEFINE(HAVE_ST_FLAGS, 1, [Define if st_flags field exists in struct stat])
-fi
-])
-
-
-#
-# AC_WIRESHARK_STRUCT_SA_LEN
+# AC_WIRESHARK_PUSH_FLAGS
#
-dnl AC_STRUCT_ST_BLKSIZE extracted from the file in question,
-dnl "acspecific.m4" in GNU Autoconf 2.12, and turned into
-dnl AC_WIRESHARK_STRUCT_SA_LEN, which checks if "struct sockaddr"
-dnl has the 4.4BSD "sa_len" member, and defines HAVE_SA_LEN; that's
-dnl what's in this file.
-dnl Done by Guy Harris <guy@alum.mit.edu> on 1998-11-14.
-
-dnl ### Checks for structure members
-
-AC_DEFUN([AC_WIRESHARK_STRUCT_SA_LEN],
-[AC_CACHE_CHECK([for sa_len in struct sockaddr], ac_cv_wireshark_struct_sa_len,
-[AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/socket.h>], [struct sockaddr s; s.sa_len;],
-ac_cv_wireshark_struct_sa_len=yes, ac_cv_wireshark_struct_sa_len=no)])
-if test $ac_cv_wireshark_struct_sa_len = yes; then
- AC_DEFINE(HAVE_SA_LEN, 1, [Define if sa_len field exists in struct sockaddr])
-fi
-])
-
-
+# Push our flags to CFLAGS/etc.
#
-# AC_WIRESHARK_IPV6_STACK
-#
-# By Jun-ichiro "itojun" Hagino, <itojun@iijlab.net>
-#
-AC_DEFUN([AC_WIRESHARK_IPV6_STACK],
+AC_DEFUN([AC_WIRESHARK_PUSH_FLAGS],
[
- v6type=unknown
- v6lib=none
-
- AC_MSG_CHECKING([ipv6 stack type])
- for i in v6d toshiba kame inria zeta linux linux-glibc solaris; do
- case $i in
- v6d)
- AC_EGREP_CPP(yes, [
-#include </usr/local/v6/include/sys/types.h>
-#ifdef __V6D__
-yes
-#endif],
- [v6type=$i; v6lib=v6;
- v6libdir=/usr/local/v6/lib;
- #
- # XXX - this doesn't define INET6;
- # is that a mistake?
- #
- CPPFLAGS="-I/usr/local/v6/include $CPPFLAGS"])
- ;;
- toshiba)
- AC_EGREP_CPP(yes, [
-#include <sys/param.h>
-#ifdef _TOSHIBA_INET6
-yes
-#endif],
- [v6type=$i; v6lib=inet6;
- v6libdir=/usr/local/v6/lib;
- AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])])
- ;;
- kame)
- AC_EGREP_CPP(yes, [
-#include <netinet/in.h>
-#ifdef __KAME__
-yes
-#endif],
- [v6type=$i; v6lib=inet6;
- v6libdir=/usr/local/v6/lib;
- AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])])
- ;;
- inria)
- AC_EGREP_CPP(yes, [
-#include <netinet/in.h>
-#ifdef IPV6_INRIA_VERSION
-yes
-#endif],
- [v6type=$i;
- AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])])
- ;;
- zeta)
- AC_EGREP_CPP(yes, [
-#include <sys/param.h>
-#ifdef _ZETA_MINAMI_INET6
-yes
-#endif],
- [v6type=$i; v6lib=inet6;
- v6libdir=/usr/local/v6/lib;
- AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])])
- ;;
- linux)
- if test -d /usr/inet6; then
- v6type=$i
- v6lib=inet6
- v6libdir=/usr/inet6
- AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])
- fi
- ;;
- linux-glibc)
- AC_EGREP_CPP(yes, [
-#include <features.h>
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || __GLIBC__ > 2
-yes
-#endif
-#endif],
- [v6type=$i; v6lib=inet6;
- AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])])
- ;;
- solaris)
- #
- # There's nothing we can check for in the header
- # file, so we just check for SunOS (pre-SunOS 5
- # versions didn't include IPv6 support, so we
- # just check the OS, not the version).
- #
- if test "`uname -s`" = "SunOS"; then
- v6type=$i
- v6lib=inet6
- AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])
- fi
- ;;
- esac
- if test "$v6type" != "unknown"; then
- break
- fi
- done
-
- if test "$v6lib" != "none"; then
- for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do
- if test -d $dir -a -f $dir/lib$v6lib.a; then
- LIBS="-L$dir $LIBS -l$v6lib"
- break
- fi
- done
- enable_ipv6="yes"
- else
- enable_ipv6="no"
- fi
- AC_MSG_RESULT(["$v6type, $v6lib"])
+ ac_ws_CPPLAGS_saved="$CPPFLAGS"
+ ac_ws_CFLAGS_saved="$CFLAGS"
+ ac_ws_CXXFLAGS_saved="$CXXFLAGS"
+ ac_ws_LDFLAGS_saved="$LDFLAGS"
+ CPPFLAGS="$WS_CPPFLAGS $CPPFLAGS"
+ CFLAGS="$WS_CFLAGS $CFLAGS"
+ CXXFLAGS="$WS_CXXFLAGS $CXXFLAGS"
+ LDFLAGS="$WS_LDFLAGS $LDFLAGS"
])
#
-# AC_WIRESHARK_GETADDRINFO_LIB_CHECK
+# AC_WIRESHARK_POP_FLAGS
#
-# Checks whether we have "getaddrinfo()" and whether we need "-lnsl" to get it.
-AC_DEFUN([AC_WIRESHARK_GETADDRINFO_LIB_CHECK],
-[
- AC_CHECK_FUNCS(getaddrinfo, ,
- AC_CHECK_LIB(nsl, getaddrinfo,
- [
- NSL_LIBS="-lnsl"
- AC_DEFINE(HAVE_GETADDRINFO, 1, [Defined if we have getaddrinfo])
- ]))
- AC_SUBST(NSL_LIBS)
-])
-
-#
-# AC_WIRESHARK_GETHOSTBY_LIB_CHECK
-#
-# Checks whether we need "-lnsl" to get "gethostby*()", which we use
-# in "resolv.c".
+# Restore user build flags.
#
-# Adapted from stuff in the AC_PATH_XTRA macro in "acspecific.m4" in
-# GNU Autoconf 2.13; the comment came from there.
-# Done by Guy Harris <guy@alum.mit.edu> on 2000-01-14.
-#
-AC_DEFUN([AC_WIRESHARK_GETHOSTBY_LIB_CHECK],
+AC_DEFUN([AC_WIRESHARK_POP_FLAGS],
[
- # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
- # to get the SysV transport functions.
- # chad@anasazi.com says the Pyramid MIS-ES running DC/OSx (SVR4)
- # needs -lnsl.
- # The nsl library prevents programs from opening the X display
- # on Irix 5.2, according to dickey@clark.net.
- AC_CHECK_FUNCS(gethostbyname, ,
- AC_CHECK_LIB(nsl, gethostbyname,
- [
- NSL_LIBS="-lnsl"
- AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [Defined if we have gethostbyname])
- ]))
- AC_SUBST(NSL_LIBS)
+ CPPFLAGS="$ac_ws_CPPLAGS_saved"
+ CFLAGS="$ac_ws_CFLAGS_saved"
+ CXXFLAGS="$ac_ws_CXXFLAGS_saved"
+ LDFLAGS="$ac_ws_LDFLAGS_saved"
])
-#
-# AC_WIRESHARK_SOCKET_LIB_CHECK
-#
-# Checks whether we need "-lsocket" to get "socket()", which is used
-# by libpcap on some platforms - and, in effect, "gethostbyname()" or
-# "getaddrinfo()" on most if not all platforms (so that it can use NIS or
-# DNS or... to look up host names).
-#
-# Adapted from stuff in the AC_PATH_XTRA macro in "acspecific.m4" in
-# GNU Autoconf 2.13; the comment came from there.
-# Done by Guy Harris <guy@alum.mit.edu> on 2000-01-14.
-#
-# We use "connect" because that's what AC_PATH_XTRA did.
-#
-AC_DEFUN([AC_WIRESHARK_SOCKET_LIB_CHECK],
-[
- # lieder@skyler.mavd.honeywell.com says without -lsocket,
- # socket/setsockopt and other routines are undefined under SCO ODT
- # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary
- # on later versions), says simon@lia.di.epfl.ch: it contains
- # gethostby* variants that don't use the nameserver (or something).
- # -lsocket must be given before -lnsl if both are needed.
- # We assume that if connect needs -lnsl, so does gethostbyname.
- AC_CHECK_FUNC(connect, ,
- AC_CHECK_LIB(socket, connect, SOCKET_LIBS="-lsocket",
- AC_MSG_ERROR(Function 'socket' not found.), $NSL_LIBS))
- AC_SUBST(SOCKET_LIBS)
-])
#
# AC_WIRESHARK_BREAKLOOP_TRY_LINK
#
AC_DEFUN([AC_WIRESHARK_PCAP_CHECK],
[
+ AC_WIRESHARK_PUSH_FLAGS
+
if test -z "$pcap_dir"
then
# Pcap header checks
#
AC_MSG_CHECKING(for extraneous pcap header directories)
found_pcap_dir=""
- 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
+ pcap_dir_list="/usr/local/include/pcap /usr/include/pcap $prefix/include/pcap $prefix/include"
for pcap_dir in $pcap_dir_list
do
if test -d $pcap_dir ; then
for extras in "-lcfg -lodm" "-lpfring"
do
AC_MSG_CHECKING([for pcap_open_live in -lpcap with $extras])
- LIBS="-lpcap $extras"
+ LIBS="-lpcap $extras $ac_save_LIBS"
#
# XXX - can't we use AC_CHECK_LIB here?
#
AC_MSG_ERROR([Can't link with library libpcap.])
fi
LIBS=$ac_save_LIBS
- ], $SOCKET_LIBS $NSL_LIBS)
+ ])
fi
AC_SUBST(PCAP_LIBS)
# libpcap.
#
ac_save_LIBS="$LIBS"
- LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS"
+ LIBS="$PCAP_LIBS $LIBS"
AC_CHECK_FUNCS(pcap_open_dead pcap_freecode)
#
# pcap_breakloop may be present in the library but not declared
AC_LANG_SOURCE(
[[
#include <pcap.h>
- main()
+ int main()
{
pcap_if_t *devpointer;
char errbuf[1];
])
AC_CHECK_FUNCS(bpf_image pcap_set_tstamp_precision)
fi
+
+ AC_WIRESHARK_POP_FLAGS
LIBS="$ac_save_LIBS"
])
AC_DEFUN([AC_WIRESHARK_PCAP_REMOTE_CHECK],
[
ac_save_LIBS="$LIBS"
- LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS"
- AC_DEFINE(HAVE_REMOTE, 1, [Define to 1 to enable remote
- capturing feature in WinPcap library])
+ LIBS="$PCAP_LIBS $LIBS"
AC_CHECK_FUNCS(pcap_open)
if test $ac_cv_func_pcap_open = "yes" ; then
AC_DEFINE(HAVE_PCAP_REMOTE, 1,
- [Define to 1 if you have WinPcap remote capturing support and prefer to use these new API features.])
+ [Define to 1 if you have libpcap/WinPcap remote capturing support and prefer to use these new API features.])
fi
AC_CHECK_FUNCS(pcap_setsampling)
LIBS="$ac_save_LIBS"
#
AC_DEFUN([AC_WIRESHARK_ZLIB_CHECK],
[
+ AC_WIRESHARK_PUSH_FLAGS
+
if test "x$zlib_dir" != "x"
then
#
# and/or linker will search that other directory before it
# searches the specified directory.
#
- wireshark_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$zlib_dir/include"
- wireshark_save_LIBS="$LIBS"
- AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
+ AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $zlib_dir/lib)
fi
#
then
#
# Well, we at least have the zlib header file.
+ #
# We link with zlib to support uncompression of
# gzipped network traffic, e.g. in an HTTP request
# or response body.
#
+ # Check for inflate() in zlib, to make sure the
+ # zlib library is usable. For example, on at
+ # least some versions of Fedora, if you have a
+ # 64-bit machine, have both the 32-bit and 64-bit
+ # versions of the run-time zlib package installed,
+ # and have only the *32-bit* version of the zlib
+ # development package installed, it'll find the
+ # header, and think it can use zlib, and will use
+ # it in subsequent tests, but it'll try and link
+ # 64-bit test programs with the 32-bit library,
+ # causing those tests to falsely fail. Hilarity
+ # ensues.
+ #
if test "x$zlib_dir" != "x"
then
- #
- # Put the "-L" flags for zlib at the beginning
- # of LIBS.
- #
- LIBS=""
- AC_WIRESHARK_ADD_DASH_L(LIBS, $zlib_dir/lib)
- LIBS="$LIBS -lz $wireshark_save_LIBS"
- else
- LIBS="-lz $LIBS"
+ WS_CPPFLAGS="$WS_CPPFLAGS -I$zlib_dir/include"
+ AC_WIRESHARK_ADD_DASH_L(WS_LDFLAGS, $zlib_dir/lib)
fi
- AC_DEFINE(HAVE_LIBZ, 1, [Define to use libz library])
+ AC_DEFINE(HAVE_ZLIB, 1, [Define to use zlib library])
+ #
+ # Check for "inflate()" in zlib to make sure we can
+ # link with it.
+ #
+ AC_CHECK_LIB(z, inflate,,
+ AC_MSG_ERROR([zlib.h found but linking with -lz failed to find inflate(); do you have the right developer package installed (32-bit vs. 64-bit)?]))
#
# Check for "inflatePrime()" in zlib, which we need
AC_MSG_ERROR(old zlib found when linking with X11 - get rid of old zlib.)
])
fi
- else
- #
- # Restore the versions of CPPFLAGS and LIBS before
- # we added the "-with-zlib=" directory, as we didn't
- # actually find zlib there.
- #
- CPPFLAGS="$wireshark_save_CPPFLAGS"
- LIBS="$wireshark_save_LIBS"
- want_zlib=no
fi
+
+ AC_WIRESHARK_POP_FLAGS
])
#
# If it's yes, it also sets $LUA_CFLAGS and $LUA_LIBS.
AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[
+ AC_WIRESHARK_PUSH_FLAGS
+
if test "x$want_lua_dir" = "x"
then
# The user didn't tell us where to find Lua. Let's go look for it.
# work reliably (some package names are not searched for).
for pkg in "lua < 5.3" lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua5.0 lua-5.0 lua50
do
- PKG_CHECK_MODULES(LUA, $pkg, [have_lua=yes], [true])
+ AC_MSG_CHECKING(if you have $pkg)
+ PKG_CHECK_EXISTS($pkg,
+ [
+ AC_MSG_RESULT(yes)
+ have_lua=yes
+ ],
+ [
+ AC_MSG_RESULT(no)
+ ])
if test "x$have_lua" = "xyes"
then
+ PKG_WIRESHARK_CHECK_SYSTEM_MODULES(LUA, $pkg)
+ CPPFLAGS="$LUA_CFLAGS $CPPFLAGS"
+ AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h)
break
fi
done
then
# The user didn't tell us where to look so we'll look in some
# standard locations.
- want_lua_dir="/usr /usr/local $prefix"
+ want_lua_dir="/usr/local /usr $prefix"
fi
for dir in $want_lua_dir
do
else
AC_MSG_RESULT($lua_ver)
- wireshark_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$header_dir"
AC_CHECK_HEADERS(lua.h lualib.h lauxlib.h, ,
[
have_lua=no
- # Restore our CPPFLAGS
- CPPFLAGS="$wireshark_save_CPPFLAGS"
])
fi
if test "x$have_lua" = "x"
then
- # Restore our CPPFLAGS and set LUA_CFLAGS
- CPPFLAGS="$wireshark_save_CPPFLAGS"
+ # Set LUA_CFLAGS
LUA_CFLAGS="-I$header_dir"
# We have the header files and they work. Now let's check if we
# searches the specified directory.
#
# XXX - lib64?
- wireshark_save_LIBS="$LIBS"
- LIBS="$LIBS -L$lua_dir/lib"
+ LDFLAGS="-L$lua_dir/lib $LDFLAGS"
AC_SEARCH_LIBS(luaL_openlibs, [lua-${lua_ver} lua${lua_ver} lua],
[
LUA_LIBS="-L$lua_dir/lib $ac_cv_search_luaL_openlibs -lm"
- LIBS="$wireshark_save_LIBS"
have_lua=yes
],[
- LIBS="$wireshark_save_LIBS"
have_lua=no
], -lm)
fi
fi
fi
+ AC_WIRESHARK_POP_FLAGS
])
#
#
AC_DEFUN([AC_WIRESHARK_LIBPORTAUDIO_CHECK],[
+ AC_WIRESHARK_PUSH_FLAGS
+ wireshark_save_LIBS="$LIBS"
+
if test "x$portaudio_dir" != "x"
then
#
# and/or linker will search that other directory before it
# searches the specified directory.
#
- wireshark_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS -I$portaudio_dir/include"
- wireshark_save_LIBS="$LIBS"
- LIBS="$LIBS -L$portaudio_dir/lib -lportaudio"
- wireshark_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$portaudio_dir/lib"
- else
- #
- # The user specified no directory in which libportaudio resides,
- # so just add "-lportaudio" to the used libs.
- #
- wireshark_save_CPPFLAGS="$CPPFLAGS"
- wireshark_save_LDFLAGS="$LDFLAGS"
- wireshark_save_LIBS="$LIBS"
- LIBS="$LIBS -lportaudio"
fi
+ LIBS="-lportaudio $LIBS"
#
# Make sure we have "portaudio.h". If we don't, it means we probably
#
AC_MSG_ERROR([libportaudio header not found in directory specified in --with-portaudio])
else
- CPPFLAGS="$wireshark_save_CPPFLAGS"
- LDFLAGS="$wireshark_save_LDFLAGS"
- LIBS="$wireshark_save_LIBS"
- PORTAUDIO_LIBS=""
if test "x$want_portaudio" = "xyes"
then
#
#
# let's check if the libs are there
#
+ PORTAUDIO_LIBS=""
+ PORTAUDIO_INCLUDES=""
AC_CHECK_LIB(portaudio, Pa_Initialize,
[
PORTAUDIO_INCLUDES="-I$portaudio_dir/include"
else
PORTAUDIO_LIBS="-lportaudio"
- PORTAUDIO_INCLUDES=""
fi
AC_DEFINE(HAVE_LIBPORTAUDIO, 1, [Define to use libportaudio library])
want_portaudio=yes
],[
- #
- # Restore the versions of CPPFLAGS, LDFLAGS, and
- # LIBS before we added the "--with-portaudio="
- # directory, as we didn't actually find portaudio
- # there.
- #
- CPPFLAGS="$wireshark_save_CPPFLAGS"
- LDFLAGS="$wireshark_save_LDFLAGS"
- LIBS="$wireshark_save_LIBS"
- PORTAUDIO_LIBS=""
# User requested --with-portaudio but it isn't available
if test "x$want_portaudio" = "xyes"
then
fi
want_portaudio=no
])
-
- CPPFLAGS="$wireshark_save_CPPFLAGS"
- LDFLAGS="$wireshark_save_LDFLAGS"
- LIBS="$wireshark_save_LIBS"
- AC_SUBST(PORTAUDIO_LIBS)
- AC_SUBST(PORTAUDIO_INCLUDES)
+ AC_SUBST(PORTAUDIO_LIBS)
+ AC_SUBST(PORTAUDIO_INCLUDES)
fi
-])
-#
-# AC_WIRESHARK_RPM_CHECK
-# Looks for the rpm program, and checks to see if we can redefine "_topdir".
-#
-AC_DEFUN([AC_WIRESHARK_RPM_CHECK],
-[
- AC_CHECK_PROG(ac_cv_wireshark_have_rpm, rpm, "yes", "no")
- if test "x$ac_cv_wireshark_have_rpm" = "xyes"; then
- rpm --define '_topdir /tmp' > /dev/null 2>&1
- AC_MSG_CHECKING(to see if we can redefine _topdir)
- if test $? -eq 0 ; then
- AC_MSG_RESULT(yes)
- HAVE_RPM=yes
- else
- AC_MSG_RESULT(no. You'll have to build packages manually.)
- HAVE_RPM=no
- fi
- fi
+ LIBS="$wireshark_save_LIBS"
+ AC_WIRESHARK_POP_FLAGS
])
-#
-# AC_WIRESHARK_GNU_SED_CHECK
-# Checks if GNU sed is the first sed in PATH.
-#
-AC_DEFUN([AC_WIRESHARK_GNU_SED_CHECK],
-[
- AC_MSG_CHECKING(for GNU sed as first sed in PATH)
- if ( sh -c "sed --version" </dev/null 2> /dev/null | grep "GNU sed" 2>&1 > /dev/null ) ; then
- AC_MSG_RESULT(yes)
- HAVE_GNU_SED=yes
- else
- AC_MSG_RESULT(no)
- HAVE_GNU_SED=no
- fi
-])
#
# AC_WIRESHARK_C_ARES_CHECK
if test "x$want_c_ares" = "xdefaultyes"; then
want_c_ares=yes
- if test "x$ac_cv_enable_usr_local" = "xyes" ; then
- withval=/usr/local
- if test -d "$withval"; then
- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
- fi
- fi
fi
if test "x$want_c_ares" = "xyes"; then
AC_CHECK_LIB(cares, ares_init,
[
C_ARES_LIBS=-lcares
- AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
- have_good_c_ares=yes
- ],, $SOCKET_LIBS $NSL_LIBS
- )
- else
- AC_MSG_RESULT(not required)
- fi
-])
-
-
-#
-# AC_WIRESHARK_ADNS_CHECK
-#
-AC_DEFUN([AC_WIRESHARK_ADNS_CHECK],
-[
- want_adns=defaultyes
-
- if test "x$want_adns" = "xdefaultyes"; then
- want_adns=yes
- if test "x$ac_cv_enable_usr_local" = "xyes" ; then
- withval=/usr/local
- if test -d "$withval"; then
- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
- fi
- 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
- )
+ AC_DEFINE(HAVE_C_ARES, 1, [Define to use c-ares library])
+ have_good_c_ares=yes
+ ])
else
AC_MSG_RESULT(not required)
fi
if test "x$want_libcap" = "xdefaultyes"; then
want_libcap=yes
- if test "x$ac_cv_enable_usr_local" = "xyes" ; then
- withval=/usr/local
- if test -d "$withval"; then
- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
- fi
- fi
fi
if test "x$want_libcap" = "xyes"; then
#
AC_DEFUN([AC_WIRESHARK_KRB5_CHECK],
[
- wireshark_save_CPPFLAGS="$CPPFLAGS"
+ AC_WIRESHARK_PUSH_FLAGS
+ wireshark_save_LIBS="$LIBS"
+
if test "x$krb5_dir" != "x"
then
#
# and/or linker will search that other directory before it
# searches the specified directory.
#
- CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
+ KRB5_CFLAGS="-I$krb5_dir/include"
ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
# MIT Kerberos moved krb5.h to krb5/krb5.h starting with release 1.5
ac_mit_version_olddir=`grep 'Massachusetts' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts.*$/MIT/'`
AC_PATH_TOOL(KRB5_CONFIG, krb5-config)
if test -x "$KRB5_CONFIG"
then
- KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
+ KRB5_CFLAGS=`"$KRB5_CONFIG" --cflags`
KRB5_LIBS=`"$KRB5_CONFIG" --libs`
- CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
#
# If -lcrypto is in KRB5_FLAGS, we require it to build
# with Heimdal/MIT. We don't want to built with it by
fi
fi
+ CPPFLAGS="$CPPFLAGS $KRB5_CFLAGS"
+
#
# Make sure we have "krb5.h". If we don't, it means we probably
# don't have kerberos, so don't use it.
# We couldn't find the header file; don't use the
# library, as it's probably not present.
#
+ KRB5_CFLAGS=""
+ KRB5_LIBS=""
want_krb5=no
AC_MSG_RESULT(No Heimdal or MIT header found - disabling dissection for some kerberos data in packet decoding)
fi
# the Kerberos library.
#
AC_MSG_RESULT($ac_krb5_version)
- wireshark_save_LIBS="$LIBS"
found_krb5_kt_resolve=no
for extras in "" "-lresolv"
do
- LIBS="$KRB5_LIBS $extras"
+ LIBS="$KRB5_LIBS $extras $wireshark_save_LIBS"
if test -z "$extras"
then
AC_MSG_CHECKING([whether $ac_krb5_version includes krb5_kt_resolve])
fi
AC_TRY_LINK(
[
+# include <krb5.h>
],
[
- krb5_kt_resolve();
+ krb5_kt_resolve(0, 0, 0);
],
[
#
- # We found "krb5_kt_resolve()", and required
- # the libraries in extras as well.
+ # We found "krb5_kt_resolve()".
#
AC_MSG_RESULT(yes)
- KRB5_LIBS="$LIBS"
+ if test -n "$extras"; then
+ KRB5_LIBS="$KRB5_LIBS $extras"
+ fi
AC_DEFINE(HAVE_KERBEROS, 1, [Define to use kerberos])
if test "x$ac_krb5_version" = "xHEIMDAL"
then
AC_MSG_ERROR(Usable $ac_krb5_version not found)
else
#
- # Restore the versions of CPPFLAGS from before we
- # added the flags for Kerberos.
+ # Don't use
#
AC_MSG_RESULT(Usable $ac_krb5_version not found - disabling dissection for some kerberos data in packet decoding)
- CPPFLAGS="$wireshark_save_CPPFLAGS"
+ KRB5_CFLAGS=""
KRB5_LIBS=""
want_krb5=no
fi
#include <krb5.h>
#include <stdio.h>
- main()
+ int main()
{
printf("%u\n", KEYTYPE_ARCFOUR_56);
}
AC_MSG_RESULT(no)
])
fi
- LIBS="$wireshark_save_LIBS"
else
#
# It's not Heimdal or MIT.
AC_MSG_ERROR(Kerberos not found)
else
#
- # Restore the versions of CPPFLAGS from before we
- # added the flags for Kerberos.
+ # Don't use.
#
AC_MSG_RESULT(Kerberos not found - disabling dissection for some kerberos data in packet decoding)
- CPPFLAGS="$wireshark_save_CPPFLAGS"
+ KRB5_CFLAGS=""
KRB5_LIBS=""
want_krb5=no
fi
# say whether they wanted us to use it but we found
# that we couldn't.
#
- # Restore the versions of CPPFLAGS from before we added
- # the flags for Kerberos.
- #
- CPPFLAGS="$wireshark_save_CPPFLAGS"
+ KRB5_CFLAGS=""
KRB5_LIBS=""
want_krb5=no
fi
+ AC_SUBST(KRB5_CFLAGS)
AC_SUBST(KRB5_LIBS)
+
+ LIBS="$wireshark_save_LIBS"
+ AC_WIRESHARK_POP_FLAGS
])
#
if test "x$want_geoip" = "xdefaultyes"; then
want_geoip=yes
- if test "x$ac_cv_enable_usr_local" = "xyes" ; then
- withval=/usr/local
- if test -d "$withval"; then
- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, ${withval}/lib)
- fi
- fi
fi
if test "x$want_geoip" = "xyes"; then
AC_DEFINE(HAVE_GEOIP_V6, 1, [Define if GeoIP supports IPv6 (GeoIP 1.4.5 and later)])
],,
)
+ AC_CHECK_LIB(GeoIP, GeoIP_free,
+ [
+ AC_DEFINE(HAVE_GEOIP_FREE, 1, [Define if GeoIP has GeoIP_free (not available upstream with 1.6.10 or earlier)])
+ ],,
+ )
+ fi
+ else
+ AC_MSG_RESULT(not required)
+ fi
+])
+
+#
+# AC_WIRESHARK_LIBSSH_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_LIBSSH_CHECK],
+[
+ want_libssh=defaultyes
+
+ if test "x$want_libssh" = "xdefaultyes"; then
+ want_libssh=yes
+ fi
+
+ if test "x$want_libssh" = "xyes"; then
+ AC_CHECK_LIB(ssh, ssh_new,
+ [
+ LIBSSH_LIBS=-lssh
+ AC_DEFINE(HAVE_LIBSSH, 1, [Define to use libssh library])
+ have_good_libssh=yes
+ ],,
+ )
+ AC_MSG_CHECKING([whether libssh >= 0.6.0 for sshdump, ciscodump])
+ PKG_CHECK_EXISTS([libssh >= 0.6.0],
+ [
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_LIBSSH_POINTSIX, 1, [Defined if libssh >= 0.6.0])
+ have_libssh_pointsix=yes
+ ],
+ [AC_MSG_RESULT(no)]
+ )
+ if test "x$have_libssh_pointsix" = "xyes"; then
+ # ssh_userauth_agent exists only >= 0.6.0, but not on Windows
+ # so check explicitly
+ AC_CHECK_LIB(ssh, ssh_userauth_agent,
+ [
+ AC_DEFINE(HAVE_SSH_USERAUTH_AGENT, 1, [Libssh library has ssh_userauth_agent])
+ have_ssh_userauth_agent=yes
+ ],,
+ )
fi
else
AC_MSG_RESULT(not required)
fi
])
+#
+# AC_WIRESHARK_NGHTTP2_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_NGHTTP2_CHECK],
+[
+ want_nghttp2=defaultyes
+
+ if test "x$want_nghttp2" = "xdefaultyes"; then
+ want_nghttp2=yes
+ fi
+
+ if test "x$want_nghttp2" = "xyes"; then
+ AC_CHECK_LIB(nghttp2, nghttp2_hd_inflate_new,
+ [
+ AC_CHECK_HEADERS(nghttp2/nghttp2.h,
+ [
+ NGHTTP2_LIBS=-lnghttp2
+ AC_DEFINE(HAVE_NGHTTP2, 1, [Define to use nghttp2 library])
+ have_good_nghttp2=yes
+ ],,
+ )
+ ],,
+ )
+ else
+ AC_MSG_RESULT(not required)
+ fi
+])
+
#AC_WIRESHARK_LDFLAGS_CHECK
#
# $1 : ldflag(s) to test
AC_DEFUN([AC_WIRESHARK_LDFLAGS_CHECK],
[LD_OPTION="$1"
AC_MSG_CHECKING(whether we can add $LD_OPTION to LDFLAGS)
-LDFLAGS_saved="$LDFLAGS"
+AC_WIRESHARK_PUSH_FLAGS
LDFLAGS="$LDFLAGS $LD_OPTION"
+can_add_to_ldflags=""
AC_LINK_IFELSE(
[
- AC_LANG_SOURCE([[main() { return; }]])
+ AC_LANG_SOURCE([[int main() { return 0; }]])
],
[
AC_MSG_RESULT(yes)
+ AX_APPEND_FLAG([$LD_OPTION], [WS_LDFLAGS])
+ can_add_to_ldflags=yes
],
[
AC_MSG_RESULT(no)
- LDFLAGS="$LDFLAGS_saved"
+ can_add_to_ldflags=no
])
+ AC_WIRESHARK_POP_FLAGS
])
dnl
AC_DEFUN([AC_WIRESHARK_CHECK_UNKNOWN_WARNING_OPTION_ERROR],
[
AC_MSG_CHECKING([whether the compiler fails when given an unknown warning option])
- save_CFLAGS="$CFLAGS"
+ AC_WIRESHARK_PUSH_FLAGS
CFLAGS="$CFLAGS -Wxyzzy-this-will-never-succeed-xyzzy"
AC_TRY_COMPILE(
[],
[
AC_MSG_RESULT([yes])
])
- CFLAGS="$save_CFLAGS"
+ AC_WIRESHARK_POP_FLAGS
])
dnl
# about -Wmissing-declarations. Check both.
#
AC_LANG_PUSH(C++)
+ AC_WIRESHARK_PUSH_FLAGS
save_CXXFLAGS="$CXXFLAGS"
for flag in -Wmissing-prototypes -Wmissing-declarations; do
CXXFLAGS="$save_CXXFLAGS $flag"
])
])
done
- CXXFLAGS="$save_CXXFLAGS"
+ AC_WIRESHARK_POP_FLAGS
AC_LANG_POP
if test x$ac_wireshark_non_cxx_warning_option_error = x; then
AC_MSG_RESULT([yes])
#
# The macro first determines if the compiler supports GCC-style flags.
# Then it attempts to compile with the defined cflags. The defined
-# flags are added to CFLAGS only if the compilation succeeds.
+# flags are added to WS_CHECKED_CFLAGS only if the compilation succeeds.
+# CFLAGS remains unchanged. can_add_to_cflags is set to "no" when the
+# flag is checked but unavailable. (Like-wise for CXXFLAGS.)
#
# We do this because not all such options are necessarily supported by
# the version of the particular compiler we're using.
# (Yeah, you, clang.)
#
AC_MSG_CHECKING(whether we can add $GCC_OPTION to CFLAGS)
- CFLAGS_saved="$CFLAGS"
+ AC_WIRESHARK_PUSH_FLAGS
if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
then
CFLAGS="$CFLAGS $ac_wireshark_unknown_warning_option_error $GCC_OPTION"
CFLAGS="$CFLAGS -Werror"
AC_MSG_CHECKING(whether $GCC_OPTION $4)
AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE($3)],
+ [AC_LANG_SOURCE($3)],
[
AC_MSG_RESULT(no)
#
# added them, by setting CFLAGS to the saved value plus
# just the new option.
#
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CFLAGS])
if test "$CC" = "$CC_FOR_BUILD"; then
#
# We're building the build tools with the same compiler
# with which we're building Wireshark, so add the flags
# to the flags for that compiler as well.
#
- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CFLAGS_FOR_BUILD])
fi
],
[
AC_MSG_RESULT(yes)
- CFLAGS="$CFLAGS_saved"
])
else
#
# added them, by setting CFLAGS to the saved value plus
# just the new option.
#
- CFLAGS="$CFLAGS_saved $GCC_OPTION"
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CFLAGS])
if test "$CC" = "$CC_FOR_BUILD"; then
#
# We're building the build tools with the same compiler
# with which we're building Wireshark, so add the flags
# to the flags for that compiler as well.
#
- CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD $GCC_OPTION"
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CFLAGS_FOR_BUILD])
fi
fi
],
[
AC_MSG_RESULT(no)
can_add_to_cflags=no
- CFLAGS="$CFLAGS_saved"
])
+ AC_WIRESHARK_POP_FLAGS
fi
- if test "$2" != C ; then
+ #
+ # Did we find a C++ compiler?
+ #
+ if test "x$CXX" != "x" ; then
#
- # Not C-only; if this can be added to the C++ compiler flags, add them.
+ # Yes. Is this option only for the C compiler?
#
- # If the option begins with "-W", add
- # $ac_wireshark_unknown_warning_option_error, as per the above, and
- # also add $ac_wireshark_non_cxx_warning_option_error, because at
- # lease some versions of g++ whine about -Wmissing-prototypes, the
- # fact that at least one of those versions refuses to warn about
- # function declarations without an earlier declaration nonwithstanding;
- # perhaps there's a reason not to warn about that with C++ even though
- # warning about it can be a Good Idea with C, but it's not obvious to
- # me).
- #
- # If the option begins with "-f" or "-m", add -Werror to make sure
- # that we'll get an error if we get "argument unused during compilation"
- # warnings, as those will either cause a failure for files compiled
- # with -Werror or annoying noise for files compiled without it.
- # (Yeah, you, clang++.)
- #
- AC_MSG_CHECKING(whether we can add $GCC_OPTION to CXXFLAGS)
- CXXFLAGS_saved="$CXXFLAGS"
- if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
- then
- CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION"
- elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
- then
- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
- elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
- then
- CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
- else
- CXXFLAGS="$CXXFLAGS $GCC_OPTION"
- fi
- AC_LANG_PUSH([C++])
- AC_COMPILE_IFELSE(
- [
- AC_LANG_SOURCE([[int foo;]])
- ],
- [
- AC_MSG_RESULT(yes)
- can_add_to_cxxflags=yes
- #
- # OK, do we have a test program? If so, check
- # whether it fails with this option and -Werror,
- # and, if so, don't include it.
- #
- # We test arg 4 here because arg 3 is a program which
- # could contain quotes (breaking the comparison).
- #
- if test "x$4" != "x" ; then
- CXXFLAGS="$CXXFLAGS -Werror"
- AC_MSG_CHECKING(whether $GCC_OPTION $4)
- AC_COMPILE_IFELSE(
- [AC_LANG_SOURCE($3)],
- [
- AC_MSG_RESULT(no)
- #
- # Remove "force an error for a warning" options, if we
- # added them, by setting CXXFLAGS to the saved value plus
- # just the new option.
- #
- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
- ],
- [
- AC_MSG_RESULT(yes)
- CXXFLAGS="$CXXFLAGS_saved"
- ])
- else
+ if test "$2" != C ; then
+ #
+ # Not C-only; if this option can be added to the C++ compiler
+ # options, add it.
+ #
+ # If the option begins with "-W", add
+ # $ac_wireshark_unknown_warning_option_error, as per the above, and
+ # also add $ac_wireshark_non_cxx_warning_option_error, because at
+ # lease some versions of g++ whine about -Wmissing-prototypes, the
+ # fact that at least one of those versions refuses to warn about
+ # function declarations without an earlier declaration nonwithstanding;
+ # perhaps there's a reason not to warn about that with C++ even though
+ # warning about it can be a Good Idea with C, but it's not obvious to
+ # me).
+ #
+ # If the option begins with "-f" or "-m", add -Werror to make sure
+ # that we'll get an error if we get "argument unused during compilation"
+ # warnings, as those will either cause a failure for files compiled
+ # with -Werror or annoying noise for files compiled without it.
+ # (Yeah, you, clang++.)
+ #
+ AC_MSG_CHECKING(whether we can add $GCC_OPTION to CXXFLAGS)
+ AC_WIRESHARK_PUSH_FLAGS
+ if expr "x$GCC_OPTION" : "x-W.*" >/dev/null
+ then
+ CXXFLAGS="$CXXFLAGS $ac_wireshark_unknown_warning_option_error $ac_wireshark_non_cxx_warning_option_error $GCC_OPTION"
+ elif expr "x$GCC_OPTION" : "x-f.*" >/dev/null
+ then
+ CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
+ elif expr "x$GCC_OPTION" : "x-m.*" >/dev/null
+ then
+ CXXFLAGS="$CXXFLAGS -Werror $GCC_OPTION"
+ else
+ CXXFLAGS="$CXXFLAGS $GCC_OPTION"
+ fi
+ AC_LANG_PUSH([C++])
+ AC_COMPILE_IFELSE(
+ [
+ AC_LANG_SOURCE([[int foo;]])
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ can_add_to_cxxflags=yes
#
- # Remove "force an error for a warning" options, if we
- # added them, by setting CXXFLAGS to the saved value plus
- # just the new option.
+ # OK, do we have a test program? If so, check
+ # whether it fails with this option and -Werror,
+ # and, if so, don't include it.
#
- CXXFLAGS="$CXXFLAGS_saved $GCC_OPTION"
- fi
- ],
- [
- AC_MSG_RESULT(no)
- can_add_to_cxxflags=no
- CXXFLAGS="$CXXFLAGS_saved"
- ])
- AC_LANG_POP([C++])
- fi
- if test "(" "$can_add_to_cflags" = "yes" -a "$can_add_to_cxxflags" = "no" ")" \
- -o "(" "$can_add_to_cflags" = "no" -a "$can_add_to_cxxflags" = "yes" ")"
- then
- #
- # Confusingly, some C++ compilers like -Wmissing-prototypes but
- # don't like -Wmissing-declarations and others like
- # -Wmissing-declarations but don't like -Wmissing-prototypes,
- # the fact that the corresponding C compiler likes both. Don't
- # warn about them.
- #
- if test "(" x$GCC_OPTION != x-Wmissing-prototypes ")" \
- -a "(" x$GCC_OPTION != x-Wmissing-declarations ")"
+ # We test arg 4 here because arg 3 is a program which
+ # could contain quotes (breaking the comparison).
+ #
+ if test "x$4" != "x" ; then
+ CXXFLAGS="$CXXFLAGS -Werror"
+ AC_MSG_CHECKING(whether $GCC_OPTION $4)
+ AC_COMPILE_IFELSE(
+ [AC_LANG_SOURCE($3)],
+ [
+ AC_MSG_RESULT(no)
+ #
+ # Remove "force an error for a warning" options, if we
+ # added them, by setting CXXFLAGS to the saved value plus
+ # just the new option.
+ #
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CXXFLAGS])
+ ],
+ [
+ AC_MSG_RESULT(yes)
+ ])
+ else
+ #
+ # Remove "force an error for a warning" options, if we
+ # added them, by setting CXXFLAGS to the saved value plus
+ # just the new option.
+ #
+ AX_APPEND_FLAG([$GCC_OPTION], [WS_CXXFLAGS])
+ fi
+ ],
+ [
+ AC_MSG_RESULT(no)
+ can_add_to_cxxflags=no
+ ])
+ AC_WIRESHARK_POP_FLAGS
+ AC_LANG_POP([C++])
+ fi
+ if test "(" "$can_add_to_cflags" = "yes" -a "$can_add_to_cxxflags" = "no" ")" \
+ -o "(" "$can_add_to_cflags" = "no" -a "$can_add_to_cxxflags" = "yes" ")"
then
- AC_MSG_WARN([$CC and $CXX appear to be a mismatched pair])
+ #
+ # Confusingly, some C++ compilers like -Wmissing-prototypes but
+ # don't like -Wmissing-declarations and others like
+ # -Wmissing-declarations but don't like -Wmissing-prototypes,
+ # the fact that the corresponding C compiler likes both. Don't
+ # warn about them.
+ #
+ if test "(" x$GCC_OPTION != x-Wmissing-prototypes ")" \
+ -a "(" x$GCC_OPTION != x-Wmissing-declarations ")"
+ then
+ AC_MSG_WARN([$CC and $CXX appear to be a mismatched pair])
+ fi
fi
fi
fi
AC_DEFUN([AC_WIRESHARK_GCC_FORTIFY_SOURCE_CHECK],
[
if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
- AC_MSG_CHECKING([whether -D_FORTIFY_SOURCE=... can be used (without generating a warning)])
- CFLAGS_saved="$CFLAGS"
- CPPFLAGS_saved="$CPPFLAGS"
+ AC_MSG_CHECKING([whether -D_FORTIFY_SOURCE=2 can be used (without generating a warning)])
+ AC_WIRESHARK_PUSH_FLAGS
CFLAGS="$CFLAGS -Werror"
CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
AC_COMPILE_IFELSE([
]])],
[
AC_MSG_RESULT(yes)
- #
- # (CPPFLAGS contains _D_FORTIFY_SOURCE=2)
- #
+ AX_APPEND_FLAG([-D_FORTIFY_SOURCE=2], [WS_CPPFLAGS])
],
[
AC_MSG_RESULT(no)
- # Remove -D_FORTIFY_SOURCE=2
- CPPFLAGS="$CPPFLAGS_saved"
])
- CFLAGS="$CFLAGS_saved"
+ AC_WIRESHARK_POP_FLAGS
fi
])
#
-# AC_WIRESHARK_OSX_INTEGRATION_CHECK
-#
-# Checks for the presence of OS X integration functions in the GTK+ framework
-# or as a separate library.
-#
-# GTK+ for MAC OS X now lives on www.gtk.org at:
-#
-# http://www.gtk.org/download/macos.php
+# AC_WIRESHARK_GCC_SYSTEM_INCLUDE
#
-# Details on building with GTK-OSX are available at:
+# Replace -I include flag for -isystem in FLAGS argument
#
-# http://live.gnome.org/GTK%2B/OSX/Building
-#
-# The GTK-OSX library has been renamed to gtkmacintegration.
-# It was previously named igemacintegration.
-#
-# http://live.gnome.org/GTK%2B/OSX/Integration
-# for the old Carbon-based integration functions
-#
-AC_DEFUN([AC_WIRESHARK_OSX_INTEGRATION_CHECK],
+AC_DEFUN([AC_WIRESHARK_GCC_SYSTEM_INCLUDE],
[
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$GTK_LIBS $LIBS"
-
- #
- # Check for the new integration functions in a -lgtkmacintegration
- # library.
- #
- AC_CHECK_LIB(gtkmacintegration, gtkosx_application_set_menu_bar,
- [
- AC_DEFINE(HAVE_GTKOSXAPPLICATION, 1,
- [Define to 1 if -lgtkmacintegration includes the GtkOSXApplication Integration functions.])
- have_ige_mac=yes
- # We don't want gtk stuff in LIBS (which is reset below) so
- # manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -lgtkmacintegration"
- ])
-
- if test x$have_ige_mac = x
- then
- #
- # Not found - check for the old integration functions in
- # the Gtk framework.
- #
- AC_CHECK_LIB(Gtk, gtk_mac_menu_set_menu_bar,
- [
- AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
- [Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE Mac OS X Integration functions.])
- have_ige_mac=yes
- # We don't want gtk stuff in LIBS (which is reset below) so
- # manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -lGtk"
- ])
+ if test "x$GCC" = "xyes" -o "x$CC" = "xclang" ; then
+ $1=`echo " $$1" \
+ | sed -e 's/ *-I *\// -isystem\//g' -e 's/^ *//'`
fi
+])
- if test x$have_ige_mac = x
- then
- #
- # Not found - check for the old integration functions in
- # a -lgtkmacintegration library.
- #
- AC_CHECK_LIB(gtkmacintegration, gtk_mac_menu_set_menu_bar,
- [
- AC_DEFINE(HAVE_IGE_MAC_INTEGRATION, 1,
- [Define to 1 if the the Gtk+ framework or a separate library includes the Imendio IGE Mac OS X Integration functions.])
- have_ige_mac=yes
- # We don't want gtk stuff in LIBS (which is reset below) so
- # manually set GTK_LIBS (which is more appropriate)
- GTK_LIBS="$GTK_LIBS -lgtkmacintegration"
- ])
- fi
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
+#
+# PKG_WIRESHARK_CHECK_SYSTEM_MODULES
+#
+AC_DEFUN([PKG_WIRESHARK_CHECK_SYSTEM_MODULES],
+[
+ PKG_CHECK_MODULES($@)
+ AC_WIRESHARK_GCC_SYSTEM_INCLUDE($1_CFLAGS)
])
# Based on AM_PATH_GTK in gtk-2.0.m4.
if $PKG_CONFIG --atleast-version $min_qt_version $pkg_config_module; then
mod_version=`$PKG_CONFIG --modversion $pkg_config_module`
AC_MSG_RESULT(yes (version $mod_version))
- Qt_CFLAGS="$Qt_CFLAGS `$PKG_CONFIG --cflags $pkg_config_module`"
+ mod_cflags=`$PKG_CONFIG --cflags $pkg_config_module`
+ AC_WIRESHARK_GCC_SYSTEM_INCLUDE(mod_cflags)
+ Qt_CFLAGS="$Qt_CFLAGS $mod_cflags"
Qt_LIBS="$Qt_LIBS `$PKG_CONFIG --libs $pkg_config_module`"
# Run Action-If-Found
ifelse([$4], , :, [$4])
fi
])
+AC_DEFUN([AC_WIRESHARK_QT_ADD_PIC_IF_NEEDED],
+[
+ AC_LANG_PUSH([C++])
+ AC_WIRESHARK_PUSH_FLAGS
+ CPPFLAGS="$CPPFLAGS $Qt_CFLAGS"
+ AC_MSG_CHECKING([whether Qt works without -fPIC])
+ AC_PREPROC_IFELSE(
+ [AC_LANG_SOURCE([[#include <QtCore>]])],
+ [AC_MSG_RESULT(yes)],
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_CHECKING([whether Qt works with -fPIC])
+ CPPFLAGS="$CPPFLAGS -fPIC"
+ AC_PREPROC_IFELSE(
+ [AC_LANG_SOURCE([[#include <QtCore>]])],
+ [
+ AC_MSG_RESULT(yes)
+ Qt_CFLAGS="$Qt_CFLAGS -fPIC"
+ ],
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR(Couldn't compile Qt without -fPIC nor with -fPIC)
+ ])
+ ])
+ AC_WIRESHARK_POP_FLAGS
+ AC_LANG_POP([C++])
+])
+
dnl AC_WIRESHARK_QT_CHECK([MINIMUM-VERSION, REQUESTED-MAJOR_VERSION,
dnl [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]])
dnl Test for Qt and define Qt_CFLAGS and Qt_LIBS.
# other modules.
#
AC_WIRESHARK_QT_MODULE_CHECK(Core, $1, $qt_version_to_check,
- [qt_version_to_check=$qt_version],
+ [
+ qt_version_to_check=$qt_version
+ QT_VERSION=$mod_version
+ QT_VERSION_MAJOR=`echo "$QT_VERSION" | cut -f1 -d.`
+ QT_VERSION_MINOR=`echo "$QT_VERSION" | cut -f2 -d.`
+ QT_VERSION_MICRO=`echo "$QT_VERSION" | cut -f3 -d.`
+
+ # Qt 5.7 and later requires C++11
+ AS_IF([test $QT_VERSION_MAJOR -eq 5 -a $QT_VERSION_MINOR -ge 7],
+ [AS_IF([test "$HAVE_CXX11" -eq 0], [AC_MSG_ERROR([Qt 5.7 and later requires C++11])])])
+
+ ],
[no_qt=yes])
if test x"$no_qt" = x ; then
AC_WIRESHARK_QT_MODULE_CHECK(PrintSupport, $1, $qt_version_to_check)
#
- # Qt 5.0 added multimedia widgets in the Qt
- # MultimediaWidgets module.
+ # Qt 5.0 added multimedia in the Qt
+ # Multimedia module.
#
- AC_WIRESHARK_QT_MODULE_CHECK(MultimediaWidgets, $1, $qt_version_to_check,
- AC_DEFINE(QT_MULTIMEDIAWIDGETS_LIB, 1, [Define if we have QtMultimediaWidgets]))
+ have_qt_multimedia_lib=no
+ AC_WIRESHARK_QT_MODULE_CHECK(Multimedia, $1, $qt_version_to_check,
+ have_qt_multimedia_lib=yes
+ AC_DEFINE(QT_MULTIMEDIA_LIB, 1, [Define if we have QtMultimedia]))
#
# While we're at it, look for QtMacExtras. (Presumably
- # if we're not building for OS X, it won't be present.)
+ # if we're not building for macOS, it won't be present.)
#
# XXX - is there anything in QtX11Extras or QtWinExtras
# that we should be using?
AC_WIRESHARK_QT_MODULE_CHECK(MacExtras, $1, $qt_version_to_check,
AC_DEFINE(QT_MACEXTRAS_LIB, 1, [Define if we have QtMacExtras]))
- AC_SUBST(Qt_LIBS)
+ AC_WIRESHARK_QT_ADD_PIC_IF_NEEDED
# Run Action-If-Found
ifelse([$3], , :, [$3])
fi
fi
])
+
+AC_DEFUN([AC_WIRESHARK_QT_TOOL_CHECK_LRELEASE],
+[
+ AC_WIRESHARK_QT_TOOL_CHECK(LRELEASE, lrelease, $2)
+ AC_MSG_CHECKING(whether lrelease -version works)
+ lrelease_version=`$LRELEASE -version 2>&AS_MESSAGE_LOG_FD`
+ AS_IF([test $? -ne 0],
+ [
+ AC_MSG_RESULT(no)
+ AC_MSG_ERROR([$LRELEASE -version returned non-zero exit status])
+ ])
+ AC_MSG_RESULT([ok, $lrelease_version])
+])
+
+#
+# AC_WIRESHARK_LZ4_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_LZ4_CHECK],
+[
+ AC_WIRESHARK_PUSH_FLAGS
+
+ if test "x$lz4_dir" != "x"
+ then
+ #
+ # The user specified a directory in which lz4 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 lz4 in a directory that's
+ # already in 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.
+ #
+ LZ4_CFLAGS="-I$lz4_dir/include"
+ fi
+
+ #
+ # Make sure we have "lz4.h". If we don't, it means we probably
+ # don't have lz4, so don't use it.
+ #
+ AC_CHECK_HEADER(lz4.h,,
+ [
+ if test "x$lz4_dir" != "x"
+ then
+ #
+ # The user used "--with-lz4=" to specify a directory
+ # containing lz4, but we didn't find the header file
+ # there; that either means they didn't specify the
+ # right directory or are confused about whether lz4
+ # is, in fact, installed. Report the error and give up.
+ #
+ AC_MSG_ERROR([lz4 header not found in directory specified in --with-lz4])
+ else
+ if test "x$want_lz4" = "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 lz4.h not found.)
+ else
+ #
+ # We couldn't find the header file; don't use the
+ # library, as it's probably not present.
+ #
+ want_lz4=no
+ fi
+ fi
+ ])
+
+ if test "x$want_lz4" != "xno"
+ then
+ #
+ # Well, we at least have the lz4 header file.
+ # We link with lz4 to support uncompression of
+ # CQL traffic.
+ #
+ LZ4_LIBS="-llz4"
+ ac_save_LIBS="$LIBS"
+ LIBS="$LZ4_LIBS $LIBS"
+ AC_DEFINE(HAVE_LZ4, 1, [Define to use lz4 library])
+ #
+ # Check for "LZ4_decompress_safe()" in lz4, which we need
+ # in order to read compressed capture files.
+ #
+ AC_CHECK_FUNCS(LZ4_decompress_safe)
+ LIBS="$ac_save_LIBS"
+ fi
+
+ AC_WIRESHARK_POP_FLAGS
+])
+
+#
+# AC_WIRESHARK_SNAPPY_CHECK
+#
+AC_DEFUN([AC_WIRESHARK_SNAPPY_CHECK],
+[
+ AC_WIRESHARK_PUSH_FLAGS
+
+ if test "x$snappy_dir" != "x"
+ then
+ #
+ # The user specified a directory in which snappy 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 snappy in a directory that's
+ # already in 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.
+ #
+ SNAPPY_CFLAGS="-I$snappy_dir/include"
+ fi
+
+ #
+ # Make sure we have "snappy-c.h". If we don't, it means we probably
+ # don't have snappy, so don't use it.
+ #
+ AC_CHECK_HEADER(snappy-c.h,,
+ [
+ if test "x$snappy_dir" != "x"
+ then
+ #
+ # The user used "--with-snappy=" to specify a directory
+ # containing snappy, but we didn't find the header file
+ # there; that either means they didn't specify the
+ # right directory or are confused about whether snappy
+ # is, in fact, installed. Report the error and give up.
+ #
+ AC_MSG_ERROR([snappy-c.header not found in directory specified in --with-snappy])
+ else
+ if test "x$want_snappy" = "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 snappy-c.h not found.)
+ else
+ #
+ # We couldn't find the header file; don't use the
+ # library, as it's probably not present.
+ #
+ want_snappy=no
+ fi
+ fi
+ ])
+
+ if test "x$want_snappy" != "xno"
+ then
+ #
+ # Well, we at least have the snappy-c.header file.
+ # We link with snappy to support uncompression of
+ # compressed CQL traffic.
+ #
+ SNAPPY_LIBS=-lsnappy
+ ac_save_LIBS="$LIBS"
+ LIBS="$SNAPPY_LIBS $LIBS"
+ AC_DEFINE(HAVE_SNAPPY, 1, [Define to use snappy library])
+ #
+ # Check for "snappy_uncompress()" in snappy, which we need
+ # in order to read compressed capture files.
+ #
+ AC_CHECK_FUNCS(snappy_uncompress)
+ LIBS="$ac_save_LIBS"
+ fi
+
+ AC_WIRESHARK_POP_FLAGS
+])
git.samba.org / metze / wireshark / wip.git / blobdiff