factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autoconf updates

Browse Source 
Move machine/endian.h to endian.h, use AC_HEADER_RESOLV over individual
header checks, and include prerequisites for netinet/ip.h check.
This commit is contained in:
Brent Cook 2021-11-09 22:34:58 -06:00
parent c29f380d0c
commit f690667262
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/Makefile.am
View File

@ -7,6 +7,7 @@ SUBDIRS = openssl
noinst_HEADERS = pqueue.h noinst_HEADERS = pqueue.h
noinst_HEADERS += compat/dirent.h noinst_HEADERS += compat/dirent.h
noinst_HEADERS += compat/dirent_msvc.h noinst_HEADERS += compat/dirent_msvc.h
noinst_HEADERS += compat/endian.h
noinst_HEADERS += compat/err.h noinst_HEADERS += compat/err.h
noinst_HEADERS += compat/fcntl.h noinst_HEADERS += compat/fcntl.h
noinst_HEADERS += compat/limits.h noinst_HEADERS += compat/limits.h
@ -26,8 +27,6 @@ noinst_HEADERS += compat/win32netcompat.h
noinst_HEADERS += compat/arpa/inet.h noinst_HEADERS += compat/arpa/inet.h
noinst_HEADERS += compat/arpa/nameser.h noinst_HEADERS += compat/arpa/nameser.h
noinst_HEADERS += compat/machine/endian.h
noinst_HEADERS += compat/netinet/in.h noinst_HEADERS += compat/netinet/in.h
noinst_HEADERS += compat/netinet/ip.h noinst_HEADERS += compat/netinet/ip.h
noinst_HEADERS += compat/netinet/tcp.h noinst_HEADERS += compat/netinet/tcp.h

7
include/compat/machine/endian.h → include/compat/endian.h
View File

@ -1,6 +1,6 @@
/* /*
* Public domain * Public domain
* machine/endian.h compatibility shim * endian.h compatibility shim
*/ */
#ifndef LIBCRYPTOCOMPAT_BYTE_ORDER_H_ #ifndef LIBCRYPTOCOMPAT_BYTE_ORDER_H_
@ -22,7 +22,7 @@
#endif #endif
#elif defined(HAVE_ENDIAN_H) #elif defined(HAVE_ENDIAN_H)
#include <endian.h> #include_next <endian.h>
#elif defined(__sun) || defined(_AIX) || defined(__hpux) #elif defined(__sun) || defined(_AIX) || defined(__hpux)
#include <sys/types.h> #include <sys/types.h>
@ -32,9 +32,6 @@
#include <standards.h> #include <standards.h>
#include <sys/endian.h> #include <sys/endian.h>
#else
#include_next <machine/endian.h>
#endif #endif
#ifndef __STRICT_ALIGNMENT #ifndef __STRICT_ALIGNMENT

8
m4/check-libc.m4
View File

@ -1,7 +1,11 @@
AC_DEFUN([CHECK_LIBC_COMPAT], [ AC_DEFUN([CHECK_LIBC_COMPAT], [
# Check for libc headers # Check for libc headers
AC_CHECK_HEADERS([err.h readpassphrase.h]) AC_CHECK_HEADERS([endian.h err.h readpassphrase.h])
AC_CHECK_HEADERS([arpa/nameser.h endian.h netinet/ip.h resolv.h]) AC_CHECK_HEADERS([netinet/ip.h], [], [],
[#include <sys/types.h>
#include <arpa/inet.h>
])
AC_HEADER_RESOLV
# Check for general libc functions # Check for general libc functions
AC_CHECK_FUNCS([asprintf freezero memmem]) AC_CHECK_FUNCS([asprintf freezero memmem])
AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray]) AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray])