Skip to content

Commit 3de6a08

Browse files
committed
c: Refactor configure.ac and silence autoscan warnings
Signed-off-by: Michael Brown <[email protected]>
1 parent b095879 commit 3de6a08

File tree

1 file changed

+26
-4
lines changed

1 file changed

+26
-4
lines changed

c/configure.ac

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
1+
# Configure autoconf
12
AC_INIT([libcx], [0.1], [[email protected]])
23
AC_CONFIG_MACRO_DIRS([m4])
34
AC_CONFIG_SRCDIR([src/generator.c])
45
AC_CONFIG_AUX_DIR([build-aux])
56
AC_CONFIG_HEADERS([config.h])
7+
8+
# Check for programs
69
AC_PROG_CC
10+
AC_PROG_CXX
711
AM_PROG_AR
12+
13+
# Configure libtool
14+
LT_INIT([shared])
15+
16+
# Configure automake
17+
AM_INIT_AUTOMAKE([foreign subdir-objects])
18+
19+
# Check for libraries
820
PKG_CHECK_MODULES(SSL, openssl)
9-
AC_CHECK_HEADERS([stdlib.h openssl/rand_drbg.h openssl/x509.h])
21+
22+
# Check for headers
23+
AC_CHECK_HEADERS([stddef.h stdlib.h string.h \
24+
openssl/rand_drbg.h openssl/x509.h])
25+
26+
# Check for types
1027
AC_TYPE_SIZE_T
11-
AC_CHECK_FUNCS([RAND_DRBG_instantiate])
28+
29+
# Check for library functions
30+
AC_FUNC_MALLOC
31+
AC_CHECK_FUNCS([memset])
32+
33+
# Configure tests
1234
AX_VALGRIND_DFLT([sgcheck], [off])
1335
AX_VALGRIND_CHECK
1436
AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
1537
m4_foreach([vgtool], [valgrind_tool_list],
1638
[AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)])
17-
LT_INIT([shared])
18-
AM_INIT_AUTOMAKE([foreign subdir-objects])
39+
40+
# Generate files
1941
AC_CONFIG_FILES([Makefile src/Makefile])
2042
AC_OUTPUT

0 commit comments

Comments
 (0)