osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Don't enable airpcap if we don't HAVE_LIBPCAP. 

svn path=/trunk/; revision=41799
This commit is contained in:
Jeff Morriss 2012-03-27 15:15:52 +00:00
parent c77146cc0d
commit 989057bb09
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
configure.in
View File

@ -1225,7 +1225,26 @@ else
AC_WIRESHARK_PCAP_CHECK
fi
# Enable/disable dumpcap
dnl Check for airpcap
AC_MSG_CHECKING(whether to include airpcap support)
AC_ARG_ENABLE(airpcap,
AC_HELP_STRING( [--enable-airpcap],
[use AirPcap in Wireshark @<:@default=yes@:>@]),
enable_airpcap=$enableval, enable_airpcap=yes)
if test x$enable_airpcap = xyes; then
if test "x$want_pcap" = "xno" ; then
enable_airpcap=no
AC_MSG_RESULT(pcap not available - disabling airpcap)
else
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap])
fi
else
AC_MSG_RESULT(no)
fi
dnl dumpcap check
AC_MSG_CHECKING(whether to build dumpcap)
@ -1730,21 +1749,6 @@ AC_DEFINE(WS_VAR_IMPORT, extern, [Define as the string to precede external varia
#
AC_DEFINE(WS_MSVC_NORETURN,, [Define as the string to precede declarations of routines that never return])
AC_ARG_ENABLE(airpcap,
[
AC_HELP_STRING( [--enable-airpcap],
[use AirPcap in Wireshark @<:@default=yes@:>@])
],[
enable_airpcap=$enableval
if test x$enable_airpcap != xno; then
AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap])
fi
],[
enable_airpcap=yes
AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap])
]
)
dnl Checks for typedefs, structures, and compiler characteristics.
# AC_C_CONST