diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-22 21:05:25 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-22 21:05:25 +0000 |
| commit | 8aa05e0f58133508e3916b2a90a06f7f90b8dcf7 (patch) | |
| tree | 8620f0334c98576b10075282f4eea9f203b521f7 /configure.in | |
| parent | 4020fb9c391ffd6db845f9d2be9c9bcdaa1cc604 (diff) | |
Postpone checking if dumpcap is enabled until after we have checked if we have libpcap or not: if not, don't bother trying to build dumpcap.
svn path=/trunk/; revision=22592
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/configure.in b/configure.in index b1ae4d90bc..b7ffb2b583 100644 --- a/configure.in +++ b/configure.in @@ -702,24 +702,8 @@ fi AC_SUBST(editcap_bin) AC_SUBST(editcap_man) - -# Enable/disable dumpcap - -AC_ARG_ENABLE(dumpcap, - AC_HELP_STRING( [--enable-dumpcap], - [build dumpcap. @<:@default=yes@:>@]), - enable_dumpcap=$enableval,enable_dumpcap=yes) - -if test "x$enable_dumpcap" = "xyes" ; then - dumpcap_bin="dumpcap\$(EXEEXT)" - dumpcap_man="dumpcap.1" -else - dumpcap_bin="" - dumpcap_man="" -fi -AC_SUBST(dumpcap_bin) -AC_SUBST(dumpcap_man) - +# Enabling/disabling of dumpcap is done later (after we know if we have PCAP +# or not) # Enable/disable capinfos @@ -858,6 +842,37 @@ else AC_WIRESHARK_PCAP_CHECK fi +# Enable/disable dumpcap + +dnl dumpcap check +AC_MSG_CHECKING(whether to build dumpcap) + +AC_ARG_ENABLE(dumpcap, + AC_HELP_STRING( [--enable-dumpcap], + [build dumpcap. @<:@default=yes@:>@]), + enable_dumpcap=$enableval,enable_dumpcap=yes) + +if test "x$enable_dumpcap" = "xyes" ; then + if test "x$want_pcap" = "xno" ; then + enable_dumpcap=no + AC_MSG_RESULT(pcap not available - disabling dumpcap) + else + AC_MSG_RESULT(yes) + fi +else + AC_MSG_RESULT(no) +fi + +if test "x$enable_dumpcap" = "xyes" ; then + dumpcap_bin="dumpcap\$(EXEEXT)" + dumpcap_man="dumpcap.1" +else + dumpcap_bin="" + dumpcap_man="" +fi +AC_SUBST(dumpcap_bin) +AC_SUBST(dumpcap_man) + dnl zlib check AC_MSG_CHECKING(whether to use zlib for reading compressed capture files) |