------------------------------------------------------------ revno: 12354 revision-id: squid3@treenet.co.nz-20121010015028-gz726tau17znj1ar parent: squid3@treenet.co.nz-20121010014817-89wgt1ih54m3ko4b committer: Amos Jeffries branch nick: 3.3 timestamp: Tue 2012-10-09 19:50:28 -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-20121010015028-gz726tau17znj1ar # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # testament_sha1: 1e57ae3fdd89cdcfb9a3bd0e9acfe4a068bda1a5 # timestamp: 2012-10-10 01:52:37 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3 # base_revision_id: squid3@treenet.co.nz-20121010014817-\ # 89wgt1ih54m3ko4b # # Begin patch === modified file 'configure.ac' --- configure.ac 2012-10-10 01:36:31 +0000 +++ configure.ac 2012-10-10 01:50:28 +0000 @@ -1140,7 +1140,6 @@ esac #Iphlpapi.h check delayed after winsock2.h AC_CHECK_HEADERS( \ - net/if_dl.h \ sys/sockio.h \ sys/param.h ) @@ -1152,9 +1151,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 ]])