| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | Uptream-Status: Pending |
| 2 | |
| 3 | Signed-off-by: Zongchun Yu <Zongchun.Yu@freescale.com> |
| 4 | |
| 5 | --- a/configure.ac |
| 6 | +++ b/configure.ac |
| 7 | @@ -402,7 +402,6 @@ |
| 8 | |
| 9 | dnl 0.9.6 (which is still thinks it is 0.9.5 due to a bug) introduces an important |
| 10 | dnl fix for OSX. See: http://tcpreplay.synfin.net/trac/ticket/167 |
| 11 | -libpcap_version_096=no |
| 12 | AC_RUN_IFELSE(AC_LANG_PROGRAM([[ |
| 13 | #include <string.h> |
| 14 | #include <stdlib.h> |
| 15 | @@ -419,11 +418,12 @@ |
| 16 | exit(0); |
| 17 | |
| 18 | exit(1); |
| 19 | -]]), [ |
| 20 | - libpcap_version_096=yes |
| 21 | -]) |
| 22 | +]]), |
| 23 | + [libpcap_version_096=yes], |
| 24 | + [libpcap_version_096=no], |
| 25 | + [libpcap_version_096=yes] |
| 26 | +) |
| 27 | |
| 28 | -libpcap_ver8=no |
| 29 | AC_RUN_IFELSE(AC_LANG_PROGRAM([[ |
| 30 | #include <string.h> |
| 31 | #include <stdlib.h> |
| 32 | @@ -444,13 +444,12 @@ |
| 33 | exit(0); |
| 34 | |
| 35 | exit(1); |
| 36 | -]]), [ |
| 37 | - libpcap_ver8=yes |
| 38 | -], [ |
| 39 | - libpcap_ver8=no |
| 40 | -]) |
| 41 | +]]), |
| 42 | + [libpcap_ver8=yes], |
| 43 | + [libpcap_ver8=no], |
| 44 | + [libpcap_ver8=yes] |
| 45 | +) |
| 46 | |
| 47 | -libpcap_ver7=no |
| 48 | AC_RUN_IFELSE(AC_LANG_PROGRAM([[ |
| 49 | #include <string.h> |
| 50 | #include <stdlib.h> |
| 51 | @@ -469,11 +468,11 @@ |
| 52 | exit(0); |
| 53 | |
| 54 | exit(1); |
| 55 | -]]), [ |
| 56 | - libpcap_ver7=yes |
| 57 | -], [ |
| 58 | - libpcap_ver7=no |
| 59 | -]) |
| 60 | +]]), |
| 61 | + [libpcap_ver7=yes], |
| 62 | + [libpcap_ver7=no], |
| 63 | + [libpcap_ver7=yes] |
| 64 | +) |
| 65 | |
| 66 | if test x$libpcap_ver8 = xyes ; then |
| 67 | AC_MSG_RESULT(>= 0.8.0) |
| 68 | @@ -761,8 +760,8 @@ |
| 69 | |
| 70 | have_bpf=no |
| 71 | dnl Check for BSD's BPF |
| 72 | -AC_MSG_CHECKING(for BPF device sending support) |
| 73 | -AC_TRY_RUN([ |
| 74 | +AC_CACHE_CHECK([for BPF device sending support], ac_cv_have_bpf, |
| 75 | +[AC_TRY_RUN([ |
| 76 | #include <stdio.h> |
| 77 | #include <stdlib.h> |
| 78 | #include <sys/types.h> |
| 79 | @@ -796,8 +795,11 @@ |
| 80 | [Do we have BPF device support?]) |
| 81 | AC_MSG_RESULT(yes) |
| 82 | have_bpf=yes |
| 83 | -],[ |
| 84 | - AC_MSG_RESULT(no) |
| 85 | +], |
| 86 | +[AC_MSG_RESULT(no)], |
| 87 | +[AC_MSG_ERROR([cross-compiling, |
| 88 | + presetting ac_cv_have_bpf=(yes|no) will help])] |
| 89 | +) |
| 90 | ]) |
| 91 | |
| 92 | |