-AC_INIT([DHCP],[4.4.2-dev],[dhcp-users@isc.org])
+AC_INIT([DHCP],[4.4.3],[dhcp-users@isc.org])
# we specify "foreign" to avoid having to have the GNU mandated files,
if test "$enable_dhcpv6" = "no"; then
AC_MSG_ERROR([dhcpv4o6 requires dhcpv6])
fi
- AC_DEFINE([DHCP4o6], [1],
+ AC_DEFINE([DHCP4o6], [1],
[Define to 1 to include DHCPv4 over DHCPv6 support.])
else
# so we can report below
# Testing section
+# Bind Makefile needs to know ATF is not included.
+AM_CONDITIONAL(BIND_ATF, test "foo" = "barr")
+
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")]),
+ AS_HELP_STRING([--with-atf=PATH],[specify location where atf was installed]),
[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"
- ATF_LDFLAGS="-L$atf_path/lib -latf-c"
- ATF_BIN=`cd $srcdir; pwd`/bind/atf/bin
- AC_SUBST(ATF_CFLAGS)
- AC_SUBST(ATF_LDFLAGS)
- AC_SUBST(ATF_BIN)
- BINDCONFIG="$BINDCONFIG --with-atf"
-elif test "$atf_path" != "no" ; then
+if test "$atf_path" != "no" ; then
DISTCHECK_ATF_CONFIGURE_FLAG="--with-atf=$atf_path"
# Config path for pkg-config
atf_pcp=""
LIBS="-lrt $LIBS"
fi
-# check for /dev/random (declares HAVE_DEV_RANDOM)
+# check for /dev/random (declares ISC_PATH_RANDOMDEV)
AC_MSG_CHECKING(for random device)
AC_ARG_WITH(randomdev,
AS_HELP_STRING([--with-randomdev=PATH],[Path for random device
else
AC_MSG_RESULT($use_randomdev)
AC_CHECK_FILE($use_randomdev,
- AC_DEFINE([HAVE_DEV_RANDOM], [1],
- [Define to 1 if you have the /dev/random or other configured file.]),
+ AC_DEFINE_UNQUOTED([ISC_PATH_RANDOMDEV], ["$use_randomdev"],
+ [Define if you have the /dev/random or other configured file.]),
AC_MSG_ERROR(cannot find $use_randomdev))
fi
BINDCONFIG="$BINDCONFIG --with-randomdev=$use_randomdev"
BINDLIBIRSDIR="$BINDDIR/lib"
BINDLIBDNSDIR="$BINDDIR/lib"
BINDLIBISCCFGDIR="$BINDDIR/lib"
- BINDLIBISCDIR="$BINDDIR/lib"
+ BINDLIBISCDIR="$BINDDIR/lib"
DISTCHECK_LIBBIND_CONFIGURE_FLAG="--with-libbind=$use_libbind"
;;
esac
omapip/Makefile.am
omapip/Makefile
relay/Makefile
+ relay/tests/Makefile
server/Makefile
tests/Makefile.am
tests/Makefile