Skip to content

Commit

Permalink
Autoconf updates
Browse files Browse the repository at this point in the history
Move machine/endian.h to endian.h, use AC_HEADER_RESOLV over individual
header checks, and include prerequisites for netinet/ip.h check.
  • Loading branch information
busterb committed Nov 10, 2021
1 parent c29f380 commit f690667
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
3 changes: 1 addition & 2 deletions include/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ SUBDIRS = openssl
noinst_HEADERS = pqueue.h
noinst_HEADERS += compat/dirent.h
noinst_HEADERS += compat/dirent_msvc.h
noinst_HEADERS += compat/endian.h
noinst_HEADERS += compat/err.h
noinst_HEADERS += compat/fcntl.h
noinst_HEADERS += compat/limits.h
Expand All @@ -26,8 +27,6 @@ noinst_HEADERS += compat/win32netcompat.h
noinst_HEADERS += compat/arpa/inet.h
noinst_HEADERS += compat/arpa/nameser.h

noinst_HEADERS += compat/machine/endian.h

noinst_HEADERS += compat/netinet/in.h
noinst_HEADERS += compat/netinet/ip.h
noinst_HEADERS += compat/netinet/tcp.h
Expand Down
7 changes: 2 additions & 5 deletions include/compat/machine/endian.h → include/compat/endian.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Public domain
* machine/endian.h compatibility shim
* endian.h compatibility shim
*/

#ifndef LIBCRYPTOCOMPAT_BYTE_ORDER_H_
Expand All @@ -22,7 +22,7 @@
#endif

#elif defined(HAVE_ENDIAN_H)
#include <endian.h>
#include_next <endian.h>

#elif defined(__sun) || defined(_AIX) || defined(__hpux)
#include <sys/types.h>
Expand All @@ -32,9 +32,6 @@
#include <standards.h>
#include <sys/endian.h>

#else
#include_next <machine/endian.h>

#endif

#ifndef __STRICT_ALIGNMENT
Expand Down
8 changes: 6 additions & 2 deletions m4/check-libc.m4
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
AC_DEFUN([CHECK_LIBC_COMPAT], [
# Check for libc headers
AC_CHECK_HEADERS([err.h readpassphrase.h])
AC_CHECK_HEADERS([arpa/nameser.h endian.h netinet/ip.h resolv.h])
AC_CHECK_HEADERS([endian.h err.h readpassphrase.h])
AC_CHECK_HEADERS([netinet/ip.h], [], [],
[#include <sys/types.h>
#include <arpa/inet.h>
])
AC_HEADER_RESOLV
# Check for general libc functions
AC_CHECK_FUNCS([asprintf freezero memmem])
AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray])
Expand Down

0 comments on commit f690667

Please sign in to comment.