Skip to content

Commit a2a1a71

Browse files
committed
autoconf: Find a local libpcap even with rcX directory suffix
(cherry picked from commit f91ef58)
1 parent 6f3693d commit a2a1a71

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

aclocal.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,9 +495,9 @@ AC_DEFUN(AC_LBL_LIBPCAP,
495495
AC_MSG_CHECKING(for local pcap library)
496496
lastdir=FAIL
497497
places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
498-
egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
498+
egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT|rc.)?$'`
499499
places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
500-
egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT)?$'`
500+
egrep '/libpcap-[[0-9]]+\.[[0-9]]+(\.[[0-9]]*)?([[ab]][[0-9]]*|-PRE-GIT|rc.)?$'`
501501
for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
502502
basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//' | \
503503
sed -e 's/-PRE-GIT$//' `

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5149,9 +5149,9 @@ $as_echo "yes" >&6; }
51495149
$as_echo_n "checking for local pcap library... " >&6; }
51505150
lastdir=FAIL
51515151
places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \
5152-
egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
5152+
egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT|rc.)?$'`
51535153
places2=`ls .. | sed -e 's,/$,,' -e "s,^,../," | \
5154-
egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT)?$'`
5154+
egrep '/libpcap-[0-9]+\.[0-9]+(\.[0-9]*)?([ab][0-9]*|-PRE-GIT|rc.)?$'`
51555155
for dir in $places $srcdir/../libpcap ../libpcap $srcdir/libpcap $places2 ; do
51565156
basedir=`echo $dir | sed -e 's/[ab][0-9]*$//' | \
51575157
sed -e 's/-PRE-GIT$//' `

0 commit comments

Comments
 (0)