Skip to content

Commit 118c6cd

Browse files
committed
Try and fix Coverity for #196
1 parent 05cccc7 commit 118c6cd

1 file changed

Lines changed: 10 additions & 5 deletions

File tree

configure.ac

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,26 @@ AC_CONFIG_SRCDIR([configure.ac])
77
AC_CONFIG_HEADERS([config.h])
88
AC_CONFIG_MACRO_DIR([config])
99
AM_INIT_AUTOMAKE([subdir-objects foreign])
10-
AC_LANG_PUSH([C++])
10+
AC_LANG([C++])
1111

1212
# Checks for programs.
1313
AC_PROG_CXX
14+
AC_LANG_PUSH(C)
1415
AC_PROG_CC
16+
AC_LANG_POP(C)
1517

1618
# Checks for libraries.
1719

1820
LT_INIT
1921
AC_PROG_LIBTOOL
2022

21-
# Check we have -std=c++11 support
22-
AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
23-
23+
AC_LANG_PUSH(C)
2424
# Switch the C compiler into C99 mode
2525
AC_PROG_CC_C99
26+
AC_LANG_POP(C)
27+
28+
# Check we have -std=c++11 support
29+
AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
2630

2731
# Checks for header files.
2832
AC_CHECK_HEADERS([arpa/inet.h stdint.h stdlib.h string.h])
@@ -117,7 +121,8 @@ echo \
117121
${PACKAGE_NAME} Version ${PACKAGE_VERSION}
118122

119123
Prefix: '${prefix}'
120-
Compiler: '${CXX} ${CXXFLAGS} ${CPPFLAGS}'
124+
C++ Compiler: '${CXX} ${CXXFLAGS} ${CPPFLAGS}'
125+
C Compiler: '${CC} ${CFLAGS} ${CPPFLAGS}'
121126
Linker: '${LD} ${LDFLAGS} ${LIBS}'
122127

123128
Now type 'make @<:@<target>@:>@'

0 commit comments

Comments
 (0)