diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-04-18 10:05:52 +0200 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-04-18 10:05:52 +0200 |
| commit | f3b6151972048f6ab832d526b0aff48772ad9c1c (patch) | |
| tree | 70f74c5bf46b2c597164bba5526b22e830e57cff /configure.ac | |
| parent | 5a428b2edf6b7d2e7d6dcdad1fc0bb17868817f2 (diff) | |
| download | isc-dhcp-f3b6151972048f6ab832d526b0aff48772ad9c1c.tar.gz | |
last fixes
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 9391d7d0..fd936410 100644 --- a/configure.ac +++ b/configure.ac @@ -189,12 +189,14 @@ fi # Testing section +DISTCHECK_ATF_CONFIGURE_FLAG= atf_path="no" AC_ARG_WITH([atf], AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed (or "bind")]), [atf_path="$withval"]) AM_CONDITIONAL(BIND_ATF, test "$atf_path" = "bind") if test "$atf_path" = "bind" ; then + DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=bind" atf_pcp="bind" atf_path="\${top_srcdir}/bind/atf" ATF_CFLAGS="-I$atf_path/include -DUNIT_TEST" @@ -205,6 +207,7 @@ if test "$atf_path" = "bind" ; then AC_SUBST(ATF_BIN) BINDCONFIG="$BINDCONFIG --with-atf" elif test "$atf_path" != "no" ; then + DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path" # Config path for pkg-config atf_pcp="" if test "$atf_path" != "yes" ; then @@ -252,6 +255,7 @@ fi AM_CONDITIONAL(HAVE_ATF, test "$atf_pcp" != "") 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 @@ -558,10 +562,13 @@ AC_CHECK_MEMBER(struct sockaddr.sa_len, [#include <sys/socket.h>]) # figure out pointer size +SAVE_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -I$srcdir" AC_CHECK_SIZEOF(struct iaddr *, , [ #include "includes/inet.h" #include <stdio.h> ]) +CFLAGS="$SAVE_CFLAGS" # Solaris does not have the msg_control or msg_controlen members # in the msghdr structure unless you define: |