diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2021-12-17 09:42:48 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2021-12-17 09:42:48 +0900 |
| commit | 27d945084f6926d0ebe8066fb60db785f3a8fb57 (patch) | |
| tree | 5cc62ca266375427eaf6701b7de55258f6baa4e2 | |
| parent | 14f5d73e2731b83b18e9771eb3068c6dbba6f069 (diff) | |
| download | libgcrypt-27d945084f6926d0ebe8066fb60db785f3a8fb57.tar.gz | |
random: Keep --enable-random-daemon, but not its use from runtime.
* configure.ac (--enable-random-daemon): Don't define
USE_RANDOM_DAEMON, but use the conditional ENABLE_RANDOM_DAEMON.
* src/Makefile.am: Use the conditional ENABLE_RANDOM_DAEMON.
--
GnuPG-bug-id: 5706
Fixes-commit: 754ad5815b5bb7462260414f2bc5f449bee0b1c6
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | src/Makefile.am | 8 |
2 files changed, 9 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 51a81210..e8ef8378 100644 --- a/configure.ac +++ b/configure.ac @@ -528,14 +528,10 @@ AC_MSG_CHECKING([whether the experimental random daemon is requested]) AC_ARG_ENABLE([random-daemon], AS_HELP_STRING([--enable-random-daemon], [Build the experimental gcryptrnd]), - [use_random_daemon=$enableval], - [use_random_daemon=no]) -AC_MSG_RESULT($use_random_daemon) -if test x$use_random_daemon = xyes ; then - AC_DEFINE(USE_RANDOM_DAEMON,1, - [Define to support the experimental random daemon]) -fi -AM_CONDITIONAL(USE_RANDOM_DAEMON, test x$use_random_daemon = xyes) + [enable_random_daemon=$enableval], + [enable_random_daemon=no]) +AC_MSG_RESULT($enable_random_daemon) +AM_CONDITIONAL(ENABLE_RANDOM_DAEMON, test x$enable_random_daemon = xyes) # Implementation of --disable-asm. @@ -799,7 +795,7 @@ AC_ARG_WITH(pth-prefix, if test x$pth_config_prefix != x ; then PTH_CONFIG="$pth_config_prefix/bin/pth-config" fi -if test "$use_random_daemon" = "yes"; then +if test "$enable_random_daemon" = "yes"; then AC_PATH_PROG(PTH_CONFIG, pth-config, no) if test "$PTH_CONFIG" = "no"; then AC_MSG_WARN([[ diff --git a/src/Makefile.am b/src/Makefile.am index 4b062234..d2118f6b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,10 +33,10 @@ nodist_include_HEADERS = gcrypt.h lib_LTLIBRARIES = libgcrypt.la bin_PROGRAMS = dumpsexp hmac256 mpicalc -if USE_RANDOM_DAEMON +if ENABLE_RANDOM_DAEMON sbin_PROGRAMS = gcryptrnd bin_PROGRAMS += getrandom -endif USE_RANDOM_DAEMON +endif ENABLE_RANDOM_DAEMON # Depending on the architecture some targets require libgpg-error. if HAVE_W32CE_SYSTEM @@ -142,13 +142,13 @@ hmac256_CFLAGS = -DSTANDALONE @DEF_HMAC_BINARY_CHECK@ \ $(arch_gpg_error_cflags) hmac256_LDADD = $(arch_gpg_error_libs) -if USE_RANDOM_DAEMON +if ENABLE_RANDOM_DAEMON gcryptrnd_SOURCES = gcryptrnd.c gcryptrnd_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS) gcryptrnd_LDADD = libgcrypt.la $(GPG_ERROR_LIBS) $(PTH_LIBS) getrandom_SOURCES = getrandom.c -endif USE_RANDOM_DAEMON +endif ENABLE_RANDOM_DAEMON CLEANFILES = libgcrypt.la.done if USE_HMAC_BINARY_CHECK |