------------------------------------------------------------ revno: 11679 revision-id: squid3@treenet.co.nz-20121017001204-16i8f0nigz6jmo0l parent: squid3@treenet.co.nz-20121017000226-9791paagivb8h2vs committer: Amos Jeffries branch nick: 3.2 timestamp: Tue 2012-10-16 18:12:04 -0600 message: FreeBSD: net/if_dl.h seems to require param.h ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20121017001204-16i8f0nigz6jmo0l # target_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # testament_sha1: 302b953d6e8a84a3c18c7ed45c843266eab71972 # timestamp: 2012-10-17 00:13:37 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/branches\ # /SQUID_3_2 # base_revision_id: squid3@treenet.co.nz-20121017000226-\ # 9791paagivb8h2vs # # Begin patch === modified file 'configure.ac' --- configure.ac 2012-10-06 03:07:59 +0000 +++ configure.ac 2012-10-17 00:12:04 +0000 @@ -1115,7 +1115,6 @@ esac #Iphlpapi.h check delayed after winsock2.h AC_CHECK_HEADERS( \ - net/if_dl.h \ sys/sockio.h \ sys/param.h ) @@ -1127,9 +1126,12 @@ #include ]]) - # openbsd requires sys/param.h to be included before sysctl.h - AC_CHECK_HEADERS(sys/sysctl.h, [], [], - [[#if HAVE_SYS_PARAM_H + # OpenBSD, FreeBSD and NetBSD requires sys/param.h to be included before sysctl.h and net/if_dl.h + AC_CHECK_HEADERS( \ + net/if_dl.h \ + sys/sysctl.h, + [], [], [[ +#if HAVE_SYS_PARAM_H #include #endif ]])