--- tcpdump-3.9.7/configure 2006-09-19 21:07:56.000000000 +0200 +++ tcpdump-3.9.7.new/configure 2010-06-11 14:00:13.036370862 +0200 @@ -346,8 +346,8 @@ sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' +includedir='${FLXROOTDIR}/${prefix}/include' +oldincludedir='${FLXROOTDIR}/usr/include' infodir='${prefix}/info' mandir='${prefix}/man' @@ -1399,6 +1399,7 @@ V_CCOPT="-O" V_INCLS="" if test "${srcdir}" != "." ; then + true V_INCLS="-I\$(srcdir)" fi if test "${CFLAGS+set}" = set; then @@ -9081,21 +9082,24 @@ fi echo "$as_me:$LINENO: checking for local pcap library" >&5 echo $ECHO_N "checking for local pcap library... $ECHO_C" >&6 - libpcap=FAIL - lastdir=FAIL - places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \ - egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'` - for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do - basedir=`echo $dir | sed -e 's/[ab][0-9]*$//'` - if test $lastdir = $basedir ; then - continue; - fi - lastdir=$dir - if test -r $dir/libpcap.a ; then - libpcap=$dir/libpcap.a - d=$dir - fi - done +# libpcap=FAIL +# lastdir=FAIL +# places=`ls $srcdir/.. | sed -e 's,/$,,' -e "s,^,$srcdir/../," | \ +# egrep '/libpcap-[0-9]*.[0-9]*(.[0-9]*)?([ab][0-9]*)?$'` +# for dir in $places $srcdir/../libpcap $srcdir/libpcap ; do +# basedir=`echo $dir | sed -e 's/[ab][0-9]*$//'` +# if test $lastdir = $basedir ; then +# continue; +# fi +# lastdir=$dir +# if test -r $dir/libpcap.a ; then +# libpcap=$dir/libpcap.a +# d=$dir +# fi +# done +d=$FLXROOTDIR/usr/include/ +dir=$FLXROOTDIR/usr/lib/ +libpcap=$FLXROOTDIR/usr/lib/libpcap.a if test $libpcap = FAIL ; then echo "$as_me:$LINENO: result: not found" >&5 echo "${ECHO_T}not found" >&6 @@ -12804,6 +12808,7 @@ fi for dir in $Xprefix /usr/${host_alias} /usr /usr/local /usr/local/ssl /usr/pkg; do + # # XXX - is there a better way to check if a given library is # in a given directory than checking each of the possible @@ -12821,7 +12826,8 @@ ac_cv_ssleay_path=$dir fi if test -d $dir/include/openssl -a -f $dir/include/openssl/des.h; then - incdir="-I$dir/include" + true +# incdir="-I$dir/include" fi if test "$ac_cv_ssleay_path" != "no" -a "$incdir" != "no"; then break;