libs/libnids/patches/02-configure.patch

   1 diff -Nur libnids-1.18/configure libnids-1.18.patched/configure
   2 --- libnids-1.18/configure      2003-10-15 01:40:09.000000000 +0200
   3 +++ libnids-1.18.patched/configure      2005-06-09 12:37:42.000000000 +0200
   4 @@ -3253,7 +3253,7 @@
   5  esac
   6
   7
   8 -CFLAGS="$CFLAGS -D_BSD_SOURCE"
   9 +CFLAGS="$CFLAGS"
  10
  11  for ac_func in gettimeofday
  12  do
  13 @@ -3489,17 +3489,21 @@
  14  echo "${ECHO_T}no" >&6
  15       ;;
  16    *)
  17 -     echo "$as_me:$LINENO: result: $withval" >&5
  18 -echo "${ECHO_T}$withval" >&6
  19 +     echo "$ac_t""$withval" 1>&6
  20       if test -f $withval/pcap.h -a -f $withval/libpcap.a; then
  21          owd=`pwd`
  22          if cd $withval; then withval=`pwd`; cd $owd; fi
  23 -       PCAP_CFLAGS="-I$withval -I$withval/bpf"
  24 +       PCAPINC="-I$withval -I$withval/bpf"
  25         PCAPLIB="-L$withval -lpcap"
  26 +     elif test -f $withval/include/pcap.h -a \
  27 +              -f $withval/include/pcap-bpf.h -a \
  28 +              -f $withval/lib/libpcap.a; then
  29 +       owd=`pwd`
  30 +       if cd $withval; then withval=`pwd`; cd $owd; fi
  31 +       PCAPINC="-I$withval/include"
  32 +       PCAPLIB="-L$withval/lib -lpcap"
  33       else
  34 -        { { echo "$as_me:$LINENO: error: pcap.h or libpcap.a not found in $withval" >&5
  35 -echo "$as_me: error: pcap.h or libpcap.a not found in $withval" >&2;}
  36 -   { (exit 1); exit 1; }; }
  37 +        { echo "configure: error: pcap.h" 1>&2; exit 1; }
  38       fi
  39       ;;
  40    esac
  41 @@ -3605,10 +3609,10 @@
  42    *)
  43       echo "$as_me:$LINENO: result: $withval" >&5
  44  echo "${ECHO_T}$withval" >&6
  45 -     if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/libnet-config ; then
  46 +     if test -f $withval/include/libnet.h -a -f $withval/lib/libnet.a -a -f $withval/bin/libnet-config ; then
  47          owd=`pwd`
  48          if cd $withval; then withval=`pwd`; cd $owd; fi
  49 -       LNET_CFLAGS="-I$withval/include `$withval/libnet-config --defines`"
  50 +       LNET_CFLAGS="-I$withval/include `$withval/bin/libnet-config --defines`"
  51         LNETLIB="-L$withval/lib -lnet"
  52       elif test -f $withval/include/libnet.h -a -f $withval/src/libnet.a; then
  53          owd=`pwd`
  54 @@ -3861,7 +3865,7 @@
  55  else
  56    echo "$as_me: failed program was:" >&5
  57  cat conftest.$ac_ext >&5
  58 -HAVE_BSD_UDPHDR=0
  59 +HAVE_BSD_UDPHDR=1
  60  fi
  61  rm -f conftest.$ac_objext conftest.$ac_ext
  62