Skip to content

Commit

Permalink
Add comment re when linux/if.h and net/if.h issue resolved upstream
Browse files Browse the repository at this point in the history
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
  • Loading branch information
pqarmitage committed May 20, 2016
1 parent 128cd24 commit 5df8a46
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion configure
Expand Up @@ -4229,7 +4229,8 @@ fi
# Linux 4.5 caused <libiptc/libiptc.h> to indirectly include <net/if.h> and <linux/if.h>
# which causes a namespace collision
# which causes a namespace collision.
# This issue was resolved in Linux 4.5.5 and 4.6
LINUX_NET_IF_H_COLLISION="_WITHOUT_LINUX_NET_IF_H_COLLISION_"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiptc/libiptc.h linux/if.h and net/if.h namespace collision" >&5
$as_echo_n "checking for libiptc/libiptc.h linux/if.h and net/if.h namespace collision... " >&6; }
Expand Down
3 changes: 2 additions & 1 deletion configure.ac
Expand Up @@ -137,7 +137,8 @@ AC_SUBST(IF_H_LINK_H_COLLISION)

dnl ----[Check if have linux/if.h and net/if.h namespace collision]----
# Linux 4.5 caused <libiptc/libiptc.h> to indirectly include <net/if.h> and <linux/if.h>
# which causes a namespace collision
# which causes a namespace collision.
# This issue was resolved in Linux 4.5.5 and 4.6
LINUX_NET_IF_H_COLLISION="_WITHOUT_LINUX_NET_IF_H_COLLISION_"
AC_MSG_CHECKING([for libiptc/libiptc.h linux/if.h and net/if.h namespace collision])
AC_TRY_COMPILE([
Expand Down

0 comments on commit 5df8a46

Please sign in to comment.