Skip to content

Commit bcb107a

Browse files
authored
Merge pull request #771 from appneta/4.4.3
4.4.3
2 parents de66328 + 6cab055 commit bcb107a

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

configure.ac

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -917,9 +917,8 @@ if test -x conftest ; then
917917
libpcap_version=$(echo "$full_libpcap_version" | ${CUT} -d' ' -f3)
918918
pcap_version_ok=yes
919919
fi
920-
rm -f conftest* core core.conftest
921-
922920
AC_MSG_RESULT([$libpcap_version])
921+
rm -rf conftest.* core core.conftest 2>&1 > /dev/null
923922

924923
AC_MSG_CHECKING(for valid libpcap version)
925924
if test x$libpcap_version != xunknown; then
@@ -928,22 +927,21 @@ if test x$libpcap_version != xunknown; then
928927
libpcap_build=$(echo ${libpcap_version} | ${CUT} -d '.' -f3)
929928
if test $libpcap_major -eq 0 && \
930929
(test $libpcap_minor -lt 7 || \
931-
(test $libpcap_minor -eq 7 and test $libpcap_build -le 2))
930+
(test $libpcap_minor -eq 7 && test $libpcap_build -lt 2))
932931
then
933932
AC_MSG_ERROR([Libpcap versions < 0.7.2 are not supported
934933
Please upgrade to version 0.7.2 or better. Your version is $libpcap_version])
935934
fi
936935

937936
dnl 0.9.6 (which is still thinks it is 0.9.5 due to a bug) introduces an important
938937
dnl fix for OSX. See: http://tcpreplay.synfin.net/trac/ticket/167
939-
if test $libpcap_major -eq 0 && \
940-
test $libpcap_minor -eq 9 && \
941-
test $libpcap_build -eq 6
938+
if test $libpcap_major -gt 0 || \
939+
(test $libpcap_minor -eq 9 && test $libpcap_build -ge 6)
942940
then
943941
libpcap_version_096=yes
944942
fi
945943

946-
AC_MSG_RESULT([ok])
944+
AC_MSG_RESULT([yes])
947945
else
948946
AC_MSG_RESULT([unknown])
949947
fi

0 commit comments

Comments
 (0)