]> The Tcpdump Group git mirrors - libpcap/commitdiff
Merge branch 'add_with-libnl_switch' of https://github.com/mcr/libpcap into mcr-add_w...
authorMichael Richardson <[email protected]>
Sun, 15 Feb 2015 17:58:20 +0000 (12:58 -0500)
committerMichael Richardson <[email protected]>
Sun, 15 Feb 2015 17:58:20 +0000 (12:58 -0500)
1  2 
Makefile.in
configure
configure.in

diff --cc Makefile.in
Simple merge
diff --cc configure
Simple merge
diff --cc configure.in
index 55cfadae0dc0ed77acbb6447bcdd8d81694ff069,19b748ec557ebf16f3c008746a491fb28948ad89..7ddd7d31d7183e7b535cae6d04fc93284e61afd9
@@@ -1635,11 -1633,10 +1643,11 @@@ if test "x$enable_dbus" != "xno"; the
                        #
                        # https://bugs.freedesktop.org/show_bug.cgi?id=74029
                        #
 +                      # The user requested it, so fail.
 +                      #
                        AC_MSG_ERROR([Due to freedesktop.org bug 74029, D-Bus capture support is not available on OS X])
 -                      ;;
                esac
--      else            
++      else
                case "$host_os" in
  
                darwin*)