components/library/libdnet/patches/01-configure.patch

   1 Adjust the check for the check test framework to look for libcheck.so
   2 instead of libcheck.a.
   3
   4 Allow building in zones with shared IP stack
   5
   6 --- libdnet-libdnet-1.14/configure.orig 2021-09-12 14:42:45.488362814 +0000
   7 +++ libdnet-libdnet-1.14/configure      2021-09-12 14:49:49.173387681 +0000
   8 @@ -19553,25 +19553,25 @@
   9    *)
  10       echo "$as_me:$LINENO: result: $withval" >&5
  11  echo "${ECHO_T}$withval" >&6
  12 -     if test -f $withval/include/check.h -a -f $withval/lib/libcheck.a; then
  13 +     if test -f $withval/include/check.h -a -f $withval/lib/libcheck.so; then
  14          owd=`pwd`
  15          if cd $withval; then withval=`pwd`; cd $owd; fi
  16          CHECKINC="-I$withval/include"
  17          CHECKLIB="-L$withval/lib -lcheck"
  18 -     elif test -f $withval/src/check.h -a -f $withval/src/libcheck.a; then
  19 +     elif test -f $withval/src/check.h -a -f $withval/src/libcheck.so; then
  20          owd=`pwd`
  21          if cd $withval; then withval=`pwd`; cd $owd; fi
  22          CHECKINC="-I$withval/src"
  23          CHECKLIB="-L$withval/src -lcheck"
  24       else
  25 -        { { echo "$as_me:$LINENO: error: check.h or libcheck.a not found in $withval" >&5
  26 -echo "$as_me: error: check.h or libcheck.a not found in $withval" >&2;}
  27 +        { { echo "$as_me:$LINENO: error: check.h or libcheck.so not found in $withval" >&5
  28 +echo "$as_me: error: check.h or libcheck.so not found in $withval" >&2;}
  29     { (exit 1); exit 1; }; }
  30       fi
  31       ;;
  32    esac
  33  else
  34 -   if test -f ${prefix}/include/check.h -a -f ${prefix}/lib/libcheck.a; then
  35 +   if test -f ${prefix}/include/check.h -a -f ${prefix}/lib/libcheck.so; then
  36       CHECKINC="-I${prefix}/include"
  37       CHECKLIB="-L${prefix}/lib -lcheck"
  38       echo "$as_me:$LINENO: result: yes" >&5
  39 @@ -20246,7 +20246,7 @@
  40
  41  for ac_header in net/bpf.h net/if.h net/if_var.h \
  42             net/if_arp.h net/if_dl.h net/pfilt.h \
  43 -           net/pfvar.h net/radix.h net/raw.h net/route.h netinet/in_var.h \
  44 +           net/pfvar.h net/radix.h net/raw.h netinet/in.h netinet/in_var.h \
  45             net/if_tun.h linux/if_tun.h netinet/ip_fw.h linux/ip_fw.h \
  46             linux/ip_fwchains.h linux/netfilter_ipv4/ipchains_core.h
  47  do
  48 @@ -21601,7 +21601,7 @@
  49      if test "${ac_cv_dnet_streams_mib2+set}" = set; then
  50    echo $ECHO_N "(cached) $ECHO_C" >&6
  51  else
  52 -  if test -f /usr/include/inet/mib2.h -a -c /dev/ip ; then
  53 +  if test -f /usr/include/inet/mib2.h ; then
  54              ac_cv_dnet_streams_mib2=yes
  55          else
  56              ac_cv_dnet_streams_mib2=no