From: Francis Dupont Date: Wed, 5 Jan 2022 14:16:47 +0000 (+0100) Subject: Checkpoint before regen X-Git-Tag: v4_4_3b1^2~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cb76d2d23fe8dafaf937a4b3c1cf9cf814a83c6;p=thirdparty%2Fdhcp.git Checkpoint before regen --- diff --git a/configure.ac-base b/configure.ac-base index a981afe0..8a9cfd8f 100644 --- a/configure.ac-base +++ b/configure.ac-base @@ -635,7 +635,7 @@ if test "$have_nanosleep" = "rt"; then 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 @@ -659,8 +659,8 @@ else 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" diff --git a/includes/config.h.in b/includes/config.h.in index 1608f671..d559a338 100644 --- a/includes/config.h.in +++ b/includes/config.h.in @@ -46,9 +46,6 @@ /* Define to 1 to use the Berkeley Packet Filter interface code. */ #undef HAVE_BPF -/* Define to 1 if you have the /dev/random or other configured file. */ -#undef HAVE_DEV_RANDOM - /* Define to 1 to use DLPI interface code. */ #undef HAVE_DLPI @@ -121,6 +118,9 @@ /* Define to the string for a noreturn attribute. */ #undef ISC_DHCP_NORETURN +/* Define if you have the /dev/random or other configured file. */ +#undef ISC_PATH_RANDOMDEV + /* Define to 1 if the system has 'struct if_laddrconf'. */ #undef ISC_PLATFORM_HAVEIF_LADDRCONF