aboutsummaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2016-02-15 13:39:06 -0600
committerBrent Cook <bcook@openbsd.org>2016-02-15 13:39:06 -0600
commitd4d040c171512881b845b2b663ee9ca081e6a5b6 (patch)
tree194abc4cd6df82f023074fec9152b47f401650d8 /m4
parent9df51efab0a08a92686a94c4634beb75450da8b6 (diff)
downloadportable-d4d040c171512881b845b2b663ee9ca081e6a5b6.tar.gz
portable-d4d040c171512881b845b2b663ee9ca081e6a5b6.tar.bz2
portable-d4d040c171512881b845b2b663ee9ca081e6a5b6.zip
add things to minimize diffs with OpenNTPD-portable
Diffstat (limited to 'm4')
-rw-r--r--m4/check-libc.m45
-rw-r--r--m4/check-os-options.m431
2 files changed, 17 insertions, 19 deletions
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4
index 4a0debf..a15563b 100644
--- a/m4/check-libc.m4
+++ b/m4/check-libc.m4
@@ -46,9 +46,12 @@ AM_CONDITIONAL([HAVE_B64_NTOP], [test "x$ac_cv_func_b64_ntop_arg" = xyes])
46 46
47AC_DEFUN([CHECK_CRYPTO_COMPAT], [ 47AC_DEFUN([CHECK_CRYPTO_COMPAT], [
48# Check crypto-related libc functions and syscalls 48# Check crypto-related libc functions and syscalls
49AC_CHECK_FUNCS([arc4random_buf explicit_bzero getauxval getentropy]) 49AC_CHECK_FUNCS([arc4random arc4random_buf arc4random_uniform])
50AC_CHECK_FUNCS([explicit_bzero getauxval getentropy])
50AC_CHECK_FUNCS([timingsafe_bcmp timingsafe_memcmp]) 51AC_CHECK_FUNCS([timingsafe_bcmp timingsafe_memcmp])
52AM_CONDITIONAL([HAVE_ARC4RANDOM], [test "x$ac_cv_func_arc4random" = xyes])
51AM_CONDITIONAL([HAVE_ARC4RANDOM_BUF], [test "x$ac_cv_func_arc4random_buf" = xyes]) 53AM_CONDITIONAL([HAVE_ARC4RANDOM_BUF], [test "x$ac_cv_func_arc4random_buf" = xyes])
54AM_CONDITIONAL([HAVE_ARC4RANDOM_UNIFORM], [test "x$ac_cv_func_arc4random_uniform" = xyes])
52AM_CONDITIONAL([HAVE_EXPLICIT_BZERO], [test "x$ac_cv_func_explicit_bzero" = xyes]) 55AM_CONDITIONAL([HAVE_EXPLICIT_BZERO], [test "x$ac_cv_func_explicit_bzero" = xyes])
53AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = xyes]) 56AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = xyes])
54AM_CONDITIONAL([HAVE_TIMINGSAFE_BCMP], [test "x$ac_cv_func_timingsafe_bcmp" = xyes]) 57AM_CONDITIONAL([HAVE_TIMINGSAFE_BCMP], [test "x$ac_cv_func_timingsafe_bcmp" = xyes])
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4
index d8c4969..3cb2f82 100644
--- a/m4/check-os-options.m4
+++ b/m4/check-os-options.m4
@@ -1,10 +1,10 @@
1AC_DEFUN([CHECK_OS_OPTIONS], [ 1AC_DEFUN([CHECK_OS_OPTIONS], [
2 2
3CFLAGS="$CFLAGS -Wall -std=gnu99 -fno-strict-aliasing" 3CFLAGS="$CFLAGS -Wall -std=gnu99 -fno-strict-aliasing"
4BUILD_NC=yes
4 5
5case $host_os in 6case $host_os in
6 *aix*) 7 *aix*)
7 BUILD_NC=yes
8 HOST_OS=aix 8 HOST_OS=aix
9 if test "`echo $CC | cut -d ' ' -f 1`" != "gcc" ; then 9 if test "`echo $CC | cut -d ' ' -f 1`" != "gcc" ; then
10 CFLAGS="-qnoansialias $USER_CFLAGS" 10 CFLAGS="-qnoansialias $USER_CFLAGS"
@@ -12,24 +12,22 @@ case $host_os in
12 AC_SUBST([PLATFORM_LDADD], ['-lperfstat -lpthread']) 12 AC_SUBST([PLATFORM_LDADD], ['-lperfstat -lpthread'])
13 ;; 13 ;;
14 *cygwin*) 14 *cygwin*)
15 BUILD_NC=yes
16 HOST_OS=cygwin 15 HOST_OS=cygwin
17 ;; 16 ;;
18 *darwin*) 17 *darwin*)
19 BUILD_NC=yes
20 # weak seed on failure to open /dev/random, based on latest public source
21 # http://www.opensource.apple.com/source/Libc/Libc-997.90.3/gen/FreeBSD/arc4random.c
22 USE_BUILTIN_ARC4RANDOM=yes
23 HOST_OS=darwin 18 HOST_OS=darwin
24 HOST_ABI=macosx 19 HOST_ABI=macosx
20 # weak seed on failure to open /dev/random, based on latest
21 # public source:
22 # http://www.opensource.apple.com/source/Libc/Libc-997.90.3/gen/FreeBSD/arc4random.c
23 USE_BUILTIN_ARC4RANDOM=yes
25 ;; 24 ;;
26 *freebsd*) 25 *freebsd*)
27 BUILD_NC=yes
28 # fork detection missing, weak seed on failure
29 # https://svnweb.freebsd.org/base/head/lib/libc/gen/arc4random.c?revision=268642&view=markup
30 USE_BUILTIN_ARC4RANDOM=yes
31 HOST_OS=freebsd 26 HOST_OS=freebsd
32 HOST_ABI=elf 27 HOST_ABI=elf
28 # fork detection missing, weak seed on failure
29 # https://svnweb.freebsd.org/base/head/lib/libc/gen/arc4random.c?revision=268642&view=markup
30 USE_BUILTIN_ARC4RANDOM=yes
33 AC_SUBST([PROG_LDADD], ['-lthr']) 31 AC_SUBST([PROG_LDADD], ['-lthr'])
34 ;; 32 ;;
35 *hpux*) 33 *hpux*)
@@ -43,14 +41,14 @@ case $host_os in
43 AC_SUBST([PLATFORM_LDADD], ['-lpthread']) 41 AC_SUBST([PLATFORM_LDADD], ['-lpthread'])
44 ;; 42 ;;
45 *linux*) 43 *linux*)
46 BUILD_NC=yes
47 HOST_OS=linux 44 HOST_OS=linux
48 HOST_ABI=elf 45 HOST_ABI=elf
49 CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE" 46 CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
50 ;; 47 ;;
51 *netbsd*) 48 *netbsd*)
52 BUILD_NC=yes 49 HOST_OS=netbsd
53 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ 50 HOST_ABI=elf
51 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
54#include <sys/param.h> 52#include <sys/param.h>
55#if __NetBSD_Version__ < 700000001 53#if __NetBSD_Version__ < 700000001
56 undefined 54 undefined
@@ -58,19 +56,17 @@ case $host_os in
58 ]], [[]])], 56 ]], [[]])],
59 [ USE_BUILTIN_ARC4RANDOM=no ], 57 [ USE_BUILTIN_ARC4RANDOM=no ],
60 [ USE_BUILTIN_ARC4RANDOM=yes ] 58 [ USE_BUILTIN_ARC4RANDOM=yes ]
61 ) 59 )
62
63 HOST_OS=netbsd
64 CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE" 60 CPPFLAGS="$CPPFLAGS -D_OPENBSD_SOURCE"
65 ;; 61 ;;
66 *openbsd* | *bitrig*) 62 *openbsd* | *bitrig*)
67 BUILD_NC=yes
68 HOST_OS=openbsd 63 HOST_OS=openbsd
69 HOST_ABI=elf 64 HOST_ABI=elf
70 AC_DEFINE([HAVE_ATTRIBUTE__BOUNDED__], [1], [OpenBSD gcc has bounded]) 65 AC_DEFINE([HAVE_ATTRIBUTE__BOUNDED__], [1], [OpenBSD gcc has bounded])
71 ;; 66 ;;
72 *mingw*) 67 *mingw*)
73 HOST_OS=win 68 HOST_OS=win
69 BUILD_NC=no
74 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D__USE_MINGW_ANSI_STDIO" 70 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_POSIX -D_POSIX_SOURCE -D__USE_MINGW_ANSI_STDIO"
75 CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" 71 CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS"
76 CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0501" 72 CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0501"
@@ -80,7 +76,6 @@ case $host_os in
80 AC_SUBST([PLATFORM_LDADD], ['-lws2_32']) 76 AC_SUBST([PLATFORM_LDADD], ['-lws2_32'])
81 ;; 77 ;;
82 *solaris*) 78 *solaris*)
83 BUILD_NC=yes
84 HOST_OS=solaris 79 HOST_OS=solaris
85 HOST_ABI=elf 80 HOST_ABI=elf
86 CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP" 81 CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 -DBSD_COMP"
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 00:07:33 +0000