Skip to content

Commit 0671129

Browse files
build: add more checks
Signed-off-by: Ar Rakin <rakinar2@onesoftnet.eu.org>
1 parent fc84f4f commit 0671129

2 files changed

Lines changed: 20 additions & 9 deletions

File tree

configure.ac

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ AC_CONFIG_HEADERS([config.h])
3232
AC_CONFIG_AUX_DIR([build-aux])
3333
AC_REQUIRE_AUX_FILE([git-version-gen])
3434
AC_CONFIG_MACRO_DIR([m4])
35+
36+
AC_CANONICAL_TARGET
37+
AC_CANONICAL_HOST
38+
3539
AM_INIT_AUTOMAKE([-Wall gnu 1.11 info-in-builddir subdir-objects dist-xz dist-bzip2])
3640
AM_SILENT_RULES([yes])
3741

@@ -105,6 +109,10 @@ m4_foreach([name], [AVAILABLE_MODULES], [
105109
[enable_mod_]name[=no])
106110
])
107111

112+
AC_SUBST([FHTTPD_MAIN_CONFIG_FILE])
113+
AC_SUBST([FHTTPD_MODULE_PATH])
114+
AM_CONDITIONAL([ENABLE_DOC], [test "$enable_doc" = "yes"])
115+
108116
AC_MSG_CHECKING([whether to enable debug mode])
109117

110118
AS_IF([test "x$build_type" = "xdebug"], [
@@ -114,14 +122,9 @@ AS_IF([test "x$build_type" = "xdebug"], [
114122
CONCAT_SPACED_STRING([CPPFLAGS], [-DNDEBUG])
115123
])
116124

117-
AC_SUBST([FHTTPD_MAIN_CONFIG_FILE])
118-
AC_SUBST([FHTTPD_MODULE_PATH])
119-
AM_CONDITIONAL([ENABLE_DOC], [test "$enable_doc" = "yes"])
120-
121-
AC_CANONICAL_HOST
122-
123125
# Checks for programs.
124126
AC_PROG_CC
127+
AC_PROG_CPP
125128
AM_PROG_AR
126129
AC_PROG_LN_S
127130
AC_PROG_MKDIR_P
@@ -162,14 +165,19 @@ esac
162165
AC_DEFINE_UNQUOTED([SHARED_LIBRARY_EXTENSION], ["$shared_library_ext"], [The extension shared libraries use on this platform])
163166

164167
# Checks for header files.
168+
AC_HEADER_SYS_WAIT
169+
AC_CHECK_HEADER_STDBOOL
165170
AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h sys/socket.h sys/time.h])
166171
AC_CHECK_HEADERS([stdnoreturn.h])
167172

168173
# Checks for typedefs, structures, and compiler characteristics.
169174
CC_CHECK_VLA_SUPPORT
170175
CCLD_CHECK_RDYNAMIC_SUPPORT
176+
AC_C_INLINE
177+
AC_C_CONST
178+
AC_C_RESTRICT
179+
AC_SYS_LARGEFILE
171180

172-
AC_CHECK_HEADER_STDBOOL
173181
AC_TYPE_OFF_T
174182
AC_TYPE_PID_T
175183
AC_TYPE_SIZE_T
@@ -180,8 +188,7 @@ AC_TYPE_UINT16_T
180188
AC_TYPE_UINT32_T
181189
AC_TYPE_UINT64_T
182190
AC_TYPE_UINT8_T
183-
184-
AC_C_INLINE
191+
AC_STRUCT_TM
185192

186193
# Checks for library functions.
187194
AC_FUNC_FORK

m4/utils.m4

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@ AC_DEFUN([PRINT_SUMMARY], [
2121
AC_MSG_NOTICE([configuration summary:
2222
2323
Version: $VERSION
24+
Target: $target
25+
Host: $host
2426
Build type: $build_type
2527
Compiler: $CC
28+
Preprocessor: $CPP
29+
Linker: $LD
2630
Compiler flags: $CFLAGS
2731
Linker flags: $LDFLAGS
2832
Preprocessor flags: $CPPFLAGS

0 commit comments

Comments
 (0)