Browse Source

[build] feature consistency between build types

upate config.h.cmake for missing defines
minor adjustments to other builds for features consistency
master
Glenn Strauss 5 months ago
parent
commit
c7c342017f
  1. 10
      SConstruct
  2. 2
      configure.ac
  3. 47
      src/CMakeLists.txt
  4. 98
      src/config.h.cmake
  5. 17
      src/meson.build
  6. 5
      src/mod_authn_file.c
  7. 2
      src/mod_openssl.c
  8. 2
      src/server.c

10
SConstruct

@ -424,7 +424,6 @@ if 1:
'getrlimit',
'getuid',
'inet_aton',
'inet_ntop',
'inet_pton',
'issetugid',
'jrand48',
@ -441,11 +440,9 @@ if 1:
'mkostemp',
'mmap',
'munmap',
'pathconf',
'pipe2',
'poll',
'port_create',
'posix_fadvise',
'pread',
'preadv',
'pwrite',
@ -477,7 +474,6 @@ if 1:
# have crypt_r/crypt, and is -lcrypt needed?
if autoconf.CheckLib('crypt'):
autoconf.env.Append(
CPPFLAGS = [ '-DHAVE_LIBCRYPT' ],
LIBCRYPT = 'crypt',
)
with autoconf.restoreEnvLibs():
@ -535,7 +531,7 @@ if 1:
if not autoconf.CheckLibWithHeader('dbi', 'dbi/dbi.h', 'C'):
fail("Couldn't find dbi")
autoconf.env.Append(
CPPFLAGS = [ '-DHAVE_DBI_H', '-DHAVE_LIBDBI' ],
CPPFLAGS = [ '-DHAVE_DBI' ],
LIBDBI = 'dbi',
)
@ -620,7 +616,7 @@ if 1:
mysql_config = autoconf.checkProgram('mysql', 'mysql_config')
if not autoconf.CheckParseConfigForLib('LIBMYSQL', mysql_config + ' --cflags --libs'):
fail("Couldn't find mysql")
autoconf.env.Append(CPPFLAGS = [ '-DHAVE_MYSQL_H', '-DHAVE_LIBMYSQL' ])
autoconf.env.Append(CPPFLAGS = [ '-DHAVE_MYSQL' ])
if env['with_nss']:
nss_config = autoconf.checkProgram('nss', 'nss-config')
@ -706,7 +702,7 @@ if 1:
if env['with_pgsql']:
if not autoconf.CheckParseConfigForLib('LIBPGSQL', 'pkg-config libpq --cflags --libs'):
fail("Couldn't find libpq")
autoconf.env.Append(CPPFLAGS = [ '-DHAVE_PGSQL_H', '-DHAVE_LIBPGSQL' ])
autoconf.env.Append(CPPFLAGS = [ '-DHAVE_PGSQL' ])
if env['with_sasl']:
if not autoconf.CheckLibWithHeader('sasl2', 'sasl/sasl.h', 'C'):

2
configure.ac

@ -1459,7 +1459,6 @@ if test "$WITH_LUA" != no; then
fi
fi
AC_DEFINE([HAVE_LUA], [1], [liblua])
AC_DEFINE([HAVE_LUA_H], [1], [lua.h])
AC_SUBST([LUA_LIBS])
AC_SUBST([LUA_CFLAGS])
@ -1549,7 +1548,6 @@ AC_CHECK_FUNCS([\
memset_s \
mkostemp \
mmap \
pathconf \
pipe2 \
poll \
port_create \

47
src/CMakeLists.txt

@ -94,6 +94,7 @@ set(CMAKE_REQUIRED_FLAGS "-include sys/types.h")
check_include_files(sys/event.h HAVE_SYS_EVENT_H)
set(CMAKE_REQUIRED_FLAGS)
check_include_files(sys/filio.h HAVE_SYS_FILIO_H)
check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H)
check_include_files(sys/mman.h HAVE_SYS_MMAN_H)
check_include_files(sys/loadavg.h HAVE_SYS_LOADAVG_H)
check_include_files(sys/poll.h HAVE_SYS_POLL_H)
@ -115,8 +116,8 @@ check_include_files(malloc.h HAVE_MALLOC_H)
check_include_files(poll.h HAVE_POLL_H)
check_include_files(port.h HAVE_PORT_H)
check_include_files(pwd.h HAVE_PWD_H)
check_include_files(stddef.h HAVE_STDDEF_H)
check_include_files(stdint.h HAVE_STDINT_H)
check_include_files(stdlib.h HAVE_STDLIB_H)
check_include_files(strings.h HAVE_STRINGS_H)
check_include_files(syslog.h HAVE_SYSLOG_H)
@ -128,16 +129,15 @@ if(HAVE_LIBCRYPT_CRYPT_R)
set(HAVE_CRYPT_R 1)
set(HAVE_LIBCRYPT 1)
else()
check_library_exists(crypt crypt "" HAVE_LIBCRYPT)
check_library_exists(crypt crypt "" HAVE_LIBCRYPT_CRYPT)
if(HAVE_LIBCRYPT_CRYPT)
set(HAVE_CRYPT 1)
set(HAVE_LIBCRYPT 1)
endif()
endif()
check_function_exists(crypt_r HAVE_CRYPT_R)
check_function_exists(crypt HAVE_CRYPT)
check_include_files(sys/inotify.h HAVE_SYS_INOTIFY_H)
if(HAVE_SYS_INOTIFY_H)
check_function_exists(inotify_init HAVE_INOTIFY_INIT)
endif()
set(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
check_type_size(socklen_t HAVE_SOCKLEN_T)
set(CMAKE_EXTRA_INCLUDE_FILES)
@ -169,7 +169,7 @@ check_function_exists(getrlimit HAVE_GETRLIMIT)
check_function_exists(getuid HAVE_GETUID)
check_function_exists(gmtime_r HAVE_GMTIME_R)
check_function_exists(inet_aton HAVE_INET_ATON)
check_function_exists(inet_ntop HAVE_INET_NTOP)
check_function_exists(inet_pton HAVE_INET_PTON)
check_function_exists(jrand48 HAVE_JRAND48)
check_function_exists(kqueue HAVE_KQUEUE)
check_function_exists(localtime_r HAVE_LOCALTIME_R)
@ -182,7 +182,6 @@ check_function_exists(mempcpy HAVE_MEMPCPY)
check_function_exists(memset HAVE_MEMSET)
check_function_exists(mkostemp HAVE_MKOSTEMP)
check_function_exists(mmap HAVE_MMAP)
check_function_exists(pathconf HAVE_PATHCONF)
check_function_exists(pipe2 HAVE_PIPE2)
check_function_exists(poll HAVE_POLL)
check_function_exists(port_create HAVE_PORT_CREATE)
@ -190,7 +189,6 @@ check_function_exists(pread HAVE_PREAD)
check_function_exists(preadv HAVE_PREADV)
check_function_exists(pwrite HAVE_PWRITE)
check_function_exists(pwritev HAVE_PWRITEV)
check_function_exists(posix_fadvise HAVE_POSIX_FADVISE)
check_function_exists(select HAVE_SELECT)
check_function_exists(sendfile HAVE_SENDFILE)
check_function_exists(send_file HAVE_SEND_FILE)
@ -198,16 +196,11 @@ check_function_exists(sendfile64 HAVE_SENDFILE64)
check_function_exists(sendfilev HAVE_SENDFILEV)
check_function_exists(sigaction HAVE_SIGACTION)
check_function_exists(signal HAVE_SIGNAL)
check_function_exists(sigtimedwait HAVE_SIGTIMEDWAIT)
check_function_exists(splice HAVE_SPLICE)
check_function_exists(srandom HAVE_SRANDOM)
check_function_exists(strerror_r HAVE_STRERROR_R)
check_function_exists(strptime HAVE_STRPTIME)
check_function_exists(syslog HAVE_SYSLOG)
check_function_exists(writev HAVE_WRITEV)
check_function_exists(inet_aton HAVE_INET_ATON)
check_function_exists(issetugid HAVE_ISSETUGID)
check_function_exists(inet_pton HAVE_INET_PTON)
check_function_exists(memset_s HAVE_MEMSET_S)
check_function_exists(explicit_bzero HAVE_EXPLICIT_BZERO)
check_function_exists(explicit_memset HAVE_EXPLICIT_MEMSET)
@ -390,7 +383,6 @@ if(WITH_WOLFSSL)
check_library_exists(${WOLFSSL_LIBRARY} wolfSSL_Init "" HAVE_LIBWOLFSSL)
if(HAVE_LIBWOLFSSL)
set(CRYPTO_LIBRARY ${WOLFSSL_LIBRARY})
add_definitions(-DHAVE_WOLFSSL_SSL_H)
set(HAVE_WOLFSSL 1)
endif()
set(CMAKE_REQUIRED_INCLUDES)
@ -408,7 +400,6 @@ if(WITH_MBEDTLS)
if(HAVE_MBEDTLS_SSL_H)
check_library_exists(mbedcrypto mbedtls_base64_encode "" HAVE_LIBMBEDCRYPTO)
if(HAVE_LIBMBEDCRYPTO)
add_definitions(-DHAVE_LIBMBEDCRYPTO)
set(CRYPTO_LIBRARY mbedcrypto)
check_library_exists(mbedtls mbedtls_cipher_info_from_type "" HAVE_LIBMBEDTLS)
if(HAVE_LIBMBEDTLS)
@ -427,7 +418,6 @@ if(WITH_NSS)
check_include_files(nss/nss.h HAVE_NSS_NSS_H)
check_include_files(nss3/nss.h HAVE_NSS3_NSS_H)
if(HAVE_NSS3_NSS_H OR HAVE_NSS_NSS_H)
add_definitions(-DHAVE_NSS_NSS_H)
check_library_exists(ssl3 NSSSSL_GetVersion "" HAVE_LIBSSL3)
if(HAVE_LIBSSL3)
check_library_exists(smime3 NSSSMIME_GetVersion "" HAVE_LIBSMIME3)
@ -457,7 +447,6 @@ if(WITH_NETTLE)
set(CMAKE_REQUIRED_INCLUDES)
endif()
if(HAVE_NETTLE_NETTLE_TYPES_H)
add_definitions(-DHAVE_NETTLE_NETTLE_TYPES_H)
check_library_exists(nettle nettle_md5_init "" HAVE_LIBNETTLE)
if(HAVE_LIBNETTLE)
set(CRYPTO_LIBRARY nettle)
@ -468,9 +457,9 @@ else()
endif()
if(WITH_GNUTLS)
pkg_check_modules(LIBGNUTLS REQUIRED gnutls)
set(HAVE_LIBGNUTLS 1)
add_definitions(-DHAVE_GNUTLS_CRYPTO_H)
pkg_check_modules(GNUTLS REQUIRED gnutls)
set(HAVE_GNUTLS_CRYPTO_H 1)
set(HAVE_GNUTLS 1)
if(NOT WITH_OPENSSL AND NOT WITH_WOLFSSL AND NOT WITH_MBEDTLS AND NOT WITH_NETTLE)
set(CRYPTO_LIBRARY gnutls)
endif()
@ -605,22 +594,22 @@ if(WITH_XML)
check_include_files(libxml/tree.h HAVE_LIBXML_H)
set(CMAKE_REQUIRED_FLAGS ${XML2_LDFLAGS})
check_library_exists(xml2 xmlParseChunk "" HAVE_LIBXML)
check_library_exists(xml2 xmlParseChunk "" HAVE_LIBXML2)
set(CMAKE_REQUIRED_FLAGS)
else()
check_include_files(libxml.h HAVE_LIBXML_H)
check_library_exists(xml2 xmlParseChunk "" HAVE_LIBXML)
check_library_exists(xml2 xmlParseChunk "" HAVE_LIBXML2)
endif()
if(NOT HAVE_LIBXML_H)
message(FATAL_ERROR "libxml/tree.h couldn't be found")
endif()
if(NOT HAVE_LIBXML)
if(NOT HAVE_LIBXML2)
message(FATAL_ERROR "libxml2 couldn't be found")
endif()
else()
unset(HAVE_LIBXML_H)
unset(HAVE_LIBXML)
unset(HAVE_LIBXML2)
endif()
if(WITH_SQLITE3)
@ -706,8 +695,8 @@ endif()
if(WITH_BROTLI)
pkg_check_modules(LIBBROTLI REQUIRED libbrotlienc)
set(HAVE_BROTLI_ENCODE_H 1)
set(HAVE_BROTLI 1)
add_definitions(-DHAVE_BROTLI_ENCODE_H -DHAVE_BROTLI)
else()
unset(HAVE_BROTLI)
endif()
@ -735,10 +724,8 @@ endif()
if(WITH_LUA)
pkg_search_module(LUA REQUIRED lua5.4 lua-5.4 lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1 lua)
message(STATUS "found lua at: INCDIR: ${LUA_INCLUDE_DIRS} LIBDIR: ${LUA_LIBRARY_DIRS} LDFLAGS: ${LUA_LDFLAGS} CFLAGS: ${LUA_CFLAGS}")
set(HAVE_LIBLUA 1 "Have liblua")
set(HAVE_LUA_H 1 "Have liblua header")
else()
unset(HAVE_LIBLUA)
unset(HAVE_LUA_H)
endif()
@ -1174,7 +1161,7 @@ if(HAVE_WOLFSSL)
target_link_libraries(mod_wolfssl wolfssl)
endif()
if(HAVE_LIBGNUTLS)
if(HAVE_GNUTLS)
add_and_install_library(mod_gnutls "mod_gnutls.c")
target_link_libraries(mod_gnutls gnutls)
endif()

98
src/config.h.cmake

@ -14,10 +14,21 @@
/* System */
#cmakedefine HAVE_DLFCN_H
#cmakedefine HAVE_GETOPT_H
#cmakedefine HAVE_INTTYPES_H
#cmakedefine HAVE_LINUX_RANDOM_H
#cmakedefine HAVE_MALLOC_H
#cmakedefine HAVE_POLL_H
#cmakedefine HAVE_PORT_H
#cmakedefine HAVE_PWD_H
#cmakedefine HAVE_STDINT_H
#cmakedefine HAVE_STDLIB_H
#cmakedefine HAVE_STRINGS_H
#cmakedefine HAVE_SYSLOG_H
#cmakedefine HAVE_SYS_DEVPOLL_H
#cmakedefine HAVE_SYS_EPOLL_H
#cmakedefine HAVE_SYS_EVENT_H
#cmakedefine HAVE_SYS_FILIO_H
#cmakedefine HAVE_SYS_LOADAVG_H
#cmakedefine HAVE_SYS_MMAN_H
#cmakedefine HAVE_SYS_POLL_H
@ -30,10 +41,11 @@
#cmakedefine HAVE_SYS_UIO_H
#cmakedefine HAVE_SYS_UN_H
#cmakedefine HAVE_SYS_WAIT_H
#cmakedefine HAVE_SYS_TIME_H
#cmakedefine HAVE_UNISTD_H
#cmakedefine HAVE_PTHREAD_H
#cmakedefine HAVE_SYS_TIME_H
#cmakedefine HAVE_UNISTD_H
#cmakedefine HAVE_IPV6
#cmakedefine HAVE_STRUCT_TM_GMTOFF
#cmakedefine HAVE_WEAK_SYMBOLS
/* XATTR */
@ -43,27 +55,56 @@
#cmakedefine HAVE_SYS_EXTATTR_H
#cmakedefine HAVE_EXTATTR
/* xxHash */
#cmakedefine HAVE_XXHASH_H
/* DBI */
#cmakedefine HAVE_DBI
/* mySQL */
#cmakedefine HAVE_MYSQL_H
#cmakedefine HAVE_MYSQL
/* PostreSQL */
#cmakedefine HAVE_PGSQL
/* GnuTLS */
#cmakedefine HAVE_GNUTLS_CRYPTO_H
/* mbedTLS */
#cmakedefine HAVE_MBEDCRYPTO
/* Nettle */
#cmakedefine HAVE_NETTLE_NETTLE_TYPES_H
/* NSS */
#cmakedefine HAVE_NSS_NSS_H
#cmakedefine HAVE_NSS3_NSS_H
/* OpenSSL */
#cmakedefine HAVE_OPENSSL_SSL_H
#cmakedefine HAVE_LIBCRYPTO
#cmakedefine HAVE_LIBSSL
/* wolfSSL */
#cmakedefine HAVE_WOLFSSL_SSL_H
/* Brotli */
#cmakedefine HAVE_BROTLI
#cmakedefine HAVE_BROTLI_ENCODE_H
/* BZip */
#cmakedefine HAVE_BZLIB_H
#cmakedefine HAVE_LIBBZ2
/* ZStd */
#cmakedefine HAVE_ZSTD
#cmakedefine HAVE_ZSTD_H
/* FAM */
#cmakedefine HAVE_FAM_H
#cmakedefine HAVE_FAMNOEXISTS
/* getopt */
#cmakedefine HAVE_GETOPT_H
#cmakedefine HAVE_INTTYPES_H
/* Kerberos5 */
#cmakedefine HAVE_KRB5
/* LDAP */
#cmakedefine HAVE_LDAP_H
@ -71,26 +112,21 @@
#cmakedefine HAVE_LBER_H
#cmakedefine HAVE_LIBLBER
/* PAM */
#cmakedefine HAVE_PAM
/* XML */
#cmakedefine HAVE_LIBXML_H
#cmakedefine HAVE_LIBXML
#cmakedefine HAVE_LIBXML2
/* PCRE */
#cmakedefine HAVE_PCRE
#cmakedefine HAVE_PCRE_H
#cmakedefine HAVE_PCRE2_H
#cmakedefine HAVE_MALLOC_H
#cmakedefine HAVE_POLL_H
#cmakedefine HAVE_PWD_H
/* sqlite3 */
#cmakedefine HAVE_SQLITE3_H
#cmakedefine HAVE_STDDEF_H
#cmakedefine HAVE_STDINT_H
#cmakedefine HAVE_SYSLOG_H
/* UUID */
#cmakedefine HAVE_UUID_UUID_H
#cmakedefine HAVE_LIBUUID
@ -101,7 +137,6 @@
/* lua */
#cmakedefine HAVE_LUA_H
#cmakedefine HAVE_LIBLUA
/* gdbm */
#cmakedefine HAVE_GDBM_H
@ -120,13 +155,21 @@
#cmakedefine SIZEOF_OFF_T ${SIZEOF_OFF_T}
/* Functions */
#cmakedefine HAVE_ARC4RANDOM_BUF
#cmakedefine HAVE_CHROOT
#cmakedefine HAVE_CLOCK_GETTIME
#cmakedefine HAVE_ELFTC_COPYFILE
#cmakedefine HAVE_EPOLL_CTL
#cmakedefine HAVE_FORK
#cmakedefine HAVE_GETENTROPY
#cmakedefine HAVE_GETLOADAVG
#cmakedefine HAVE_GETRANDOM
#cmakedefine HAVE_GETRLIMIT
#cmakedefine HAVE_GETUID
#cmakedefine HAVE_GMTIME_R
#cmakedefine HAVE_INET_NTOP
#cmakedefine HAVE_INET_ATON
#cmakedefine HAVE_INET_PTON
#cmakedefine HAVE_JRAND48
#cmakedefine HAVE_KQUEUE
#cmakedefine HAVE_LOCALTIME_R
#cmakedefine HAVE_LSTAT
@ -138,15 +181,13 @@
#cmakedefine HAVE_MEMSET
#cmakedefine HAVE_MKOSTEMP
#cmakedefine HAVE_MMAP
#cmakedefine HAVE_PATHCONF
#cmakedefine HAVE_PIPE2
#cmakedefine HAVE_POLL
#cmakedefine HAVE_PORT_CREATE
#cmakedefine HAVE_PRCTL
#cmakedefine HAVE_PREAD
#cmakedefine HAVE_PREADV
#cmakedefine HAVE_PWRITE
#cmakedefine HAVE_PWRITEV
#cmakedefine HAVE_POSIX_FADVISE
#cmakedefine HAVE_SELECT
#cmakedefine HAVE_SENDFILE
#cmakedefine HAVE_SEND_FILE
@ -156,28 +197,21 @@
#cmakedefine HAVE_SIGNAL
#cmakedefine HAVE_SIGTIMEDWAIT
#cmakedefine HAVE_SPLICE
#cmakedefine HAVE_SRANDOM
#cmakedefine HAVE_STRERROR_R
#cmakedefine HAVE_STRPTIME
#cmakedefine HAVE_SYSLOG
#cmakedefine HAVE_TIMEGM
#cmakedefine HAVE_WRITEV
#cmakedefine HAVE_INET_ATON
#cmakedefine HAVE_ISSETUGID
#cmakedefine HAVE_INET_PTON
#cmakedefine HAVE_MEMSET_S
#cmakedefine HAVE_EXPLICIT_BZERO
#cmakedefine HAVE_EXPLICIT_MEMSET
#cmakedefine HAVE_COPY_FILE_RANGE
/* libcrypt */
#cmakedefine HAVE_CRYPT_H
#cmakedefine HAVE_LIBCRYPT
#cmakedefine HAVE_CRYPT
#cmakedefine HAVE_CRYPT_R
/* fastcgi */
#cmakedefine HAVE_FASTCGI_H
#cmakedefine HAVE_FASTCGI_FASTCGI_H
/* libev */
#cmakedefine HAVE_LIBEV

17
src/meson.build

@ -54,8 +54,8 @@ conf_data.set('HAVE_MALLOC_H', compiler.has_header('malloc.h'))
conf_data.set('HAVE_POLL_H', compiler.has_header('poll.h'))
conf_data.set('HAVE_PORT_H', compiler.has_header('port.h'))
conf_data.set('HAVE_PWD_H', compiler.has_header('pwd.h'))
conf_data.set('HAVE_STDDEF_H', compiler.has_header('stddef.h'))
conf_data.set('HAVE_STDINT_H', compiler.has_header('stdint.h'))
conf_data.set('HAVE_STDLIB_H', compiler.has_header('stdlib.h'))
conf_data.set('HAVE_STRINGS_H', compiler.has_header('strings.h'))
conf_data.set('HAVE_SYSLOG_H', compiler.has_header('syslog.h'))
@ -83,11 +83,6 @@ if conf_data.get('HAVE_CRYPT_H')
endif
endif
conf_data.set('HAVE_SYS_INOTIFY_H', compiler.has_header('sys/inotify.h'))
if conf_data.get('HAVE_SYS_INOTIFY_H')
conf_data.set('HAVE_INOTIFY_INIT', compiler.has_function('inotify_init', args: defs))
endif
conf_data.set('HAVE_SOCKLEN_T', compiler.has_type('socklen_t', args: defs, prefix: '#include <sys/socket.h>'))
conf_data.set('HAVE_SYS_RANDOM_H', compiler.has_header('sys/random.h'))
@ -121,7 +116,7 @@ conf_data.set('HAVE_GETRLIMIT', compiler.has_function('getrlimit', args: defs))
conf_data.set('HAVE_GETUID', compiler.has_function('getuid', args: defs))
conf_data.set('HAVE_GMTIME_R', compiler.has_function('gmtime_r', args: defs))
conf_data.set('HAVE_INET_ATON', compiler.has_function('inet_aton', args: defs))
conf_data.set('HAVE_INET_NTOP', compiler.has_function('inet_ntop', args: defs))
conf_data.set('HAVE_INET_PTON', compiler.has_function('inet_pton', args: defs))
conf_data.set('HAVE_JRAND48', compiler.has_function('jrand48', args: defs))
conf_data.set('HAVE_KQUEUE', compiler.has_function('kqueue', args: defs))
conf_data.set('HAVE_LOCALTIME_R', compiler.has_function('localtime_r', args: defs))
@ -134,11 +129,9 @@ conf_data.set('HAVE_MEMPCPY', compiler.has_function('mempcpy', args: defs))
conf_data.set('HAVE_MEMSET', compiler.has_function('memset', args: defs))
conf_data.set('HAVE_MKOSTEMP', compiler.has_function('mkostemp', args: defs))
conf_data.set('HAVE_MMAP', compiler.has_function('mmap', args: defs))
conf_data.set('HAVE_PATHCONF', compiler.has_function('pathconf', args: defs))
conf_data.set('HAVE_PIPE2', compiler.has_function('pipe2', args: defs))
conf_data.set('HAVE_POLL', compiler.has_function('poll', args: defs))
conf_data.set('HAVE_PORT_CREATE', compiler.has_function('port_create', args: defs))
conf_data.set('HAVE_POSIX_FADVISE', compiler.has_function('posix_fadvise', args: defs))
conf_data.set('HAVE_PREAD', compiler.has_function('pread', args: defs))
conf_data.set('HAVE_PREADV', compiler.has_function('preadv', args: defs))
conf_data.set('HAVE_PWRITE', compiler.has_function('pwrite', args: defs))
@ -150,17 +143,12 @@ conf_data.set('HAVE_SENDFILE64', compiler.has_function('sendfile64', args: defs)
conf_data.set('HAVE_SENDFILEV', compiler.has_function('sendfilev', args: defs))
conf_data.set('HAVE_SIGACTION', compiler.has_function('sigaction', args: defs))
conf_data.set('HAVE_SIGNAL', compiler.has_function('signal', args: defs))
conf_data.set('HAVE_SIGTIMEDWAIT', compiler.has_function('sigtimedwait', args: defs))
conf_data.set('HAVE_SPLICE', compiler.has_function('splice', args: defs))
conf_data.set('HAVE_SRANDOM', compiler.has_function('srandom', args: defs))
conf_data.set('HAVE_STRERROR_R', compiler.has_function('strerror_r', args: defs))
conf_data.set('HAVE_STRPTIME', compiler.has_function('strptime', args: defs))
conf_data.set('HAVE_SYSLOG', compiler.has_function('syslog', args: defs))
conf_data.set('HAVE_TIMEGM', compiler.has_function('timegm', args: defs))
conf_data.set('HAVE_WRITEV', compiler.has_function('writev', args: defs))
conf_data.set('HAVE_INET_ATON', compiler.has_function('inet_aton', args: defs))
conf_data.set('HAVE_ISSETUGID', compiler.has_function('issetugid', args: defs))
conf_data.set('HAVE_INET_PTON', compiler.has_function('inet_pton', args: defs))
conf_data.set('HAVE_MEMSET_S', compiler.has_function('memset_s', args: defs))
conf_data.set('HAVE_EXPLICIT_BZERO', compiler.has_function('explicit_bzero', args: defs))
conf_data.set('HAVE_EXPLICIT_MEMSET', compiler.has_function('explicit_memset', args: defs))
@ -625,6 +613,7 @@ if get_option('with_webdav_props')
# has_function doesn't like "internal dependencies"
libxml2 += libxml2_includes_dep
endif
conf_data.set('HAVE_LIBXML2', true)
conf_data.set('HAVE_LIBXML_H', true)
libsqlite3 = dependency('sqlite31', required: false)

5
src/mod_authn_file.c

@ -11,11 +11,6 @@
#include <unistd.h>
#endif
#if defined(HAVE_LIBCRYPT) && !defined(HAVE_CRYPT)
/* always assume crypt() is present if we have -lcrypt */
# define HAVE_CRYPT
#endif
#include <stdlib.h>
#include <string.h>

2
src/mod_openssl.c

@ -44,7 +44,7 @@
*/
/*#define OPENSSL_NO_STDIO*/
#ifndef USE_OPENSSL_KERBEROS
#ifndef HAVE_KRB5
#ifndef OPENSSL_NO_KRB5
#define OPENSSL_NO_KRB5
#endif

2
src/server.c

@ -633,7 +633,7 @@ static void show_features (void) {
#else
"\t- brotli support\n"
#endif
#if defined(HAVE_CRYPT) || defined(HAVE_CRYPT_R) || defined(HAVE_LIBCRYPT)
#if defined(HAVE_CRYPT) || defined(HAVE_CRYPT_R)
"\t+ crypt support\n"
#else
"\t- crypt support\n"

Loading…
Cancel
Save