diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /libnids/libnids-1.18 | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'libnids/libnids-1.18')
| -rw-r--r-- | libnids/libnids-1.18/configure.patch | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/libnids/libnids-1.18/configure.patch b/libnids/libnids-1.18/configure.patch index e69de29bb2..332675b057 100644 --- a/libnids/libnids-1.18/configure.patch +++ b/libnids/libnids-1.18/configure.patch @@ -0,0 +1,60 @@ +--- tmp/base/libnids-1.18-r0/libnids-1.18/configure.in Tue Oct 14 18:40:00 2003 ++++ libnids-1.18/configure.in Wed Nov 5 16:01:27 2003 +@@ -65,12 +65,15 @@ + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAP_CFLAGS="-I$withval -I$withval/bpf" +- PCAPLIB="-L$withval -lpcap" +- else ++ for i in $withval $withval/include $withval/lib $withval/include/pcap; do ++ if test -f $i/pcap.h; then ++ PCAP_CFLAGS="-I$i -I$i/bpf" ++ fi ++ if test -f $i/libpcap.a; then ++ PCAPLIB="-L$i -lpcap" ++ fi ++ done ++ if test -z "$PCAP_CFLAGS" -o -z "$PCAPLIB"; then + AC_ERROR(pcap.h or libpcap.a not found in $withval) + fi + ;; +@@ -127,20 +130,22 @@ + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`" +- LNETLIB="-L$withval/lib -lnet" +- elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- LNET_CFLAGS="-I$withval/include" +- LNETLIB="-L$withval/src -lnet" +- else +- echo "A working combination of libnet.h, libnet.a and libnet-config not found in $withval; get libnet from www.packetfactory.net/projects/libnet and reinstall" +- AC_ERROR(libnet) ++ LNETC="`which libnet-config 2>/dev/null`" ++ for i in $withval $withval/include $withval/lib $withval/bin; do ++ if test -f $i/libnet-config; then ++ LNETC"=$i/libnet-config" ++ fi ++ if test -f $i/libnet.h; then ++ LNET_CFLAGS="-I$i" ++ fi ++ if test -f $i/libnet.a; then ++ LNETLIB="-L$i -lnet" ++ fi ++ done ++ if test -z "$LNET_CFLAGS" -o -z "$LNETLIB" -o -z "$LNETC"; then ++ AC_ERROR([libnet not found in $withval]) + fi ++ LNET_CFLAGS="$LNET_CFLAGS `$LNETC --defines`" + ;; + esac ], + [ if test "x"$LIBNET_VER = "x"-1 ; then |