1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-25 15:49:02 +00:00

Applied a configure.in patch from Petr Salinger in Debian bug #542388 which apparently fixes the libdnet build on GNU/kFreeBSD

This commit is contained in:
fyodor
2009-08-20 08:46:00 +00:00
parent 2264838cf8
commit 978b8fc3ae
3 changed files with 47 additions and 3 deletions

View File

@@ -468,3 +468,32 @@ o Made some AIX/HP-UX portability changes sent in by Peter O'Gorman
o Added SCTP support. [Daniel Roethlisberger]
Merged to libdnet r651 and r652.
o Applied a fix for building on GNU/kFreeBSD from Peter Salinger:
--- configure (revision 15144)
+++ configure (working copy)
@@ -14712,12 +14712,22 @@
elif test "$ac_cv_header_net_if_tun_h" = yes ; then
if test "$ac_cv_header_stropts_h" = yes ; then
- case " $LIBOBJS " in
+ case "$host_os" in
+ *kfreebsd*)
+ case " $LIBOBJS " in
+ *" tun-bsd.$ac_objext "* ) ;;
+ *) LIBOBJS="$LIBOBJS tun-bsd.$ac_objext"
+ ;;
+esac
+;;
+ *)
+ case " $LIBOBJS " in
*" tun-solaris.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS tun-solaris.$ac_objext"
;;
esac
-
+;;
+ esac
else
case " $LIBOBJS " in
*" tun-bsd.$ac_objext "* ) ;;

View File

@@ -14712,12 +14712,22 @@ esac
elif test "$ac_cv_header_net_if_tun_h" = yes ; then
if test "$ac_cv_header_stropts_h" = yes ; then
case " $LIBOBJS " in
case "$host_os" in
*kfreebsd*)
case " $LIBOBJS " in
*" tun-bsd.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS tun-bsd.$ac_objext"
;;
esac
;;
*)
case " $LIBOBJS " in
*" tun-solaris.$ac_objext "* ) ;;
*) LIBOBJS="$LIBOBJS tun-solaris.$ac_objext"
;;
esac
;;
esac
else
case " $LIBOBJS " in
*" tun-bsd.$ac_objext "* ) ;;

View File

@@ -279,7 +279,12 @@ if test "$ac_cv_header_linux_if_tun_h" = yes ; then
AC_LIBOBJ([tun-linux])
elif test "$ac_cv_header_net_if_tun_h" = yes ; then
if test "$ac_cv_header_stropts_h" = yes ; then
AC_LIBOBJ([tun-solaris])
case "$host_os" in
*kfreebsd*)
AC_LIBOBJ([tun-bsd]);;
*)
AC_LIBOBJ([tun-solaris]);;
esac
else
AC_LIBOBJ([tun-bsd])
fi