diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 61 |
1 files changed, 19 insertions, 42 deletions
diff --git a/configure b/configure index 3e3fd389dc6..dd64692345b 100755 --- a/configure +++ b/configure @@ -18055,19 +18055,21 @@ $as_echo "#define USE_WIN32_SHARED_MEMORY 1" >>confdefs.h SHMEM_IMPLEMENTATION="src/backend/port/win32_shmem.c" fi -# Select random number source -# -# You can override this logic by setting the appropriate USE_*RANDOM flag to 1 -# in the template or configure command line. - -# If not selected manually, try to select a source automatically. -if test x"$USE_OPENSSL_RANDOM" = x"" && test x"$USE_WIN32_RANDOM" = x"" && test x"$USE_DEV_URANDOM" = x"" ; then - if test x"$with_openssl" = x"yes" ; then - USE_OPENSSL_RANDOM=1 - elif test "$PORTNAME" = "win32" ; then - USE_WIN32_RANDOM=1 - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/urandom" >&5 +# Select random number source. If a TLS library is used then it will be the +# first choice, else the native platform sources (Windows API or /dev/urandom) +# will be used. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which random number source to use" >&5 +$as_echo_n "checking which random number source to use... " >&6; } +if test x"$with_openssl" = x"yes" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL" >&5 +$as_echo "OpenSSL" >&6; } +elif test x"$PORTNAME" = x"win32" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows native" >&5 +$as_echo "Windows native" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/urandom" >&5 +$as_echo "/dev/urandom" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/urandom" >&5 $as_echo_n "checking for /dev/urandom... " >&6; } if ${ac_cv_file__dev_urandom+:} false; then : $as_echo_n "(cached) " >&6 @@ -18087,36 +18089,11 @@ if test "x$ac_cv_file__dev_urandom" = xyes; then : fi - if test x"$ac_cv_file__dev_urandom" = x"yes" ; then - USE_DEV_URANDOM=1 - fi - fi -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which random number source to use" >&5 -$as_echo_n "checking which random number source to use... " >&6; } -if test x"$USE_OPENSSL_RANDOM" = x"1" ; then - -$as_echo "#define USE_OPENSSL_RANDOM 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenSSL" >&5 -$as_echo "OpenSSL" >&6; } -elif test x"$USE_WIN32_RANDOM" = x"1" ; then - -$as_echo "#define USE_WIN32_RANDOM 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows native" >&5 -$as_echo "Windows native" >&6; } -elif test x"$USE_DEV_URANDOM" = x"1" ; then - -$as_echo "#define USE_DEV_URANDOM 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /dev/urandom" >&5 -$as_echo "/dev/urandom" >&6; } -else - as_fn_error $? " + if test x"$ac_cv_file__dev_urandom" = x"no" ; then + as_fn_error $? " no source of strong random numbers was found -PostgreSQL can use OpenSSL or /dev/urandom as a source of random numbers." "$LINENO" 5 +PostgreSQL can use OpenSSL, native Windows API or /dev/urandom as a source of random numbers." "$LINENO" 5 + fi fi # If not set in template file, set bytes to use libc memset() |