mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 13:57:50 +00:00
Code Issues Releases Wiki Activity

last fixes

Browse Source
This commit is contained in:
Francis Dupont
2015-04-18 10:05:52 +02:00
parent 5a428b2edf
commit f3b6151972
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@@ -29,6 +29,12 @@ SUBDIRS = @BINDSRCDIR@ includes tests common omapip client dhcpctl relay server
nobase_include_HEADERS = dhcpctl/dhcpctl.h nobase_include_HEADERS = dhcpctl/dhcpctl.h
#
# distcheck tuning
#
DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_ATF_CONFIGURE_FLAG@
distcheck-hook: distcheck-hook:
chmod u+w $(distdir)/bind chmod u+w $(distdir)/bind

7
configure.ac
View File

@@ -189,12 +189,14 @@ fi
# Testing section # Testing section
DISTCHECK_ATF_CONFIGURE_FLAG=
atf_path="no" atf_path="no"
AC_ARG_WITH([atf], AC_ARG_WITH([atf],
AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed (or "bind")]), AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed (or "bind")]),
[atf_path="$withval"]) [atf_path="$withval"])
AM_CONDITIONAL(BIND_ATF, test "$atf_path" = "bind") AM_CONDITIONAL(BIND_ATF, test "$atf_path" = "bind")
if test "$atf_path" = "bind" ; then if test "$atf_path" = "bind" ; then
DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=bind"
atf_pcp="bind" atf_pcp="bind"
atf_path="\${top_srcdir}/bind/atf" atf_path="\${top_srcdir}/bind/atf"
ATF_CFLAGS="-I$atf_path/include -DUNIT_TEST" ATF_CFLAGS="-I$atf_path/include -DUNIT_TEST"
@@ -205,6 +207,7 @@ if test "$atf_path" = "bind" ; then
AC_SUBST(ATF_BIN) AC_SUBST(ATF_BIN)
BINDCONFIG="$BINDCONFIG --with-atf" BINDCONFIG="$BINDCONFIG --with-atf"
elif test "$atf_path" != "no" ; then elif test "$atf_path" != "no" ; then
DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path"
# Config path for pkg-config # Config path for pkg-config
atf_pcp="" atf_pcp=""
if test "$atf_path" != "yes" ; then if test "$atf_path" != "yes" ; then
@@ -252,6 +255,7 @@ fi
AM_CONDITIONAL(HAVE_ATF, test "$atf_pcp" != "") AM_CONDITIONAL(HAVE_ATF, test "$atf_pcp" != "")
AM_COND_IF([HAVE_ATF], [AC_DEFINE([HAVE_ATF], [1], [ATF framework specified?])]) AM_COND_IF([HAVE_ATF], [AC_DEFINE([HAVE_ATF], [1], [ATF framework specified?])])
AC_SUBST(DISTCHECK_ATF_CONFIGURE_FLAG)
### ###
### Path fun. Older versions of DHCP were installed in /usr/sbin, so we ### Path fun. Older versions of DHCP were installed in /usr/sbin, so we
@@ -558,10 +562,13 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len,
[#include <sys/socket.h>]) [#include <sys/socket.h>])
# figure out pointer size # figure out pointer size
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I$srcdir"
AC_CHECK_SIZEOF(struct iaddr *, , [ AC_CHECK_SIZEOF(struct iaddr *, , [
#include "includes/inet.h" #include "includes/inet.h"
#include <stdio.h> #include <stdio.h>
]) ])
CFLAGS="$SAVE_CFLAGS"
# Solaris does not have the msg_control or msg_controlen members # Solaris does not have the msg_control or msg_controlen members
# in the msghdr structure unless you define: # in the msghdr structure unless you define: