Commit 0f5dd34d authored by Lev Walkin's avatar Lev Walkin

move flags around

parent eff98a50
...@@ -63,22 +63,6 @@ TESTSUITE_CFLAGS="$TESTSUITE_CFLAGS -std=gnu99"]) ...@@ -63,22 +63,6 @@ TESTSUITE_CFLAGS="$TESTSUITE_CFLAGS -std=gnu99"])
AX_CHECK_COMPILE_FLAG([-Wno-error=unused-variable], AX_CHECK_COMPILE_FLAG([-Wno-error=unused-variable],
[TESTSUITE_CFLAGS="$TESTSUITE_CFLAGS -Wno-error=unused-variable"]) [TESTSUITE_CFLAGS="$TESTSUITE_CFLAGS -Wno-error=unused-variable"])
AC_ARG_ENABLE(Werror,
[AS_HELP_STRING([--enable-Werror],
[abort compilation after any C compiler warning])],
[enable_werror=$enableval], [enable_werror=no])
AS_IF([test x$enable_werror != xno], [
ADD_CFLAGS="-Werror -W -Wpointer-arith"
])
AC_ARG_ENABLE(test-Werror,
[AS_HELP_STRING([--enable-test-Werror],
[abort compiling tests after any C compiler warning])],
[enable_test_werror=$enableval], [enable_test_werror=no])
AS_IF([test x$enable_test_werror != xno], [
TESTSUITE_CFLAGS="-Werror -W -Wpointer-arith"
])
AX_CODE_COVERAGE AX_CODE_COVERAGE
AS_IF([test x$enable_code_coverage != xno], [ AS_IF([test x$enable_code_coverage != xno], [
CFLAGS="$CFLAGS $CODE_COVERAGE_CFLAGS" CFLAGS="$CFLAGS $CODE_COVERAGE_CFLAGS"
...@@ -107,18 +91,39 @@ AX_CHECK_COMPILE_FLAG([-Wpedantic], ...@@ -107,18 +91,39 @@ AX_CHECK_COMPILE_FLAG([-Wpedantic],
[SKELETONS_CFLAGS="$SKELETONS_CFLAGS -pedantic"], [], [-Werror]) [SKELETONS_CFLAGS="$SKELETONS_CFLAGS -pedantic"], [], [-Werror])
], ],
[-Werror]) #clang 3.0 prints warning when the flag is not supported [-Werror]) #clang 3.0 prints warning when the flag is not supported
AC_ARG_ENABLE(Werror,
[AS_HELP_STRING([--enable-Werror],
[abort compilation after any C compiler warning])],
[enable_werror=$enableval], [enable_werror=no])
AS_IF([test x$enable_werror != xno], [
ADD_CFLAGS="${ADD_CFLAGS} -Werror -W -Wall -Wpointer-arith"
SKELETONS_CFLAGS="${SKELETONS_CFLAGS} -Werror -W -Wall -Wpointer-arith"
AX_CHECK_COMPILE_FLAG([-Wgnu],
[SKELETONS_CFLAGS="${SKELETONS_CFLAGS} -Wgnu"])
])
AC_ARG_ENABLE(test-Werror,
[AS_HELP_STRING([--enable-test-Werror],
[abort compiling tests after any C compiler warning])],
[enable_test_werror=$enableval], [enable_test_werror=no])
AS_IF([test x$enable_test_werror != xno], [
TESTSUITE_CFLAGS="${TESTSUITE_CFLAGS} -Werror -W -Wpointer-arith"
])
dnl Enable Address Sanitizer, if supported by gcc (4.8+) or clang. dnl Enable Address Sanitizer, if supported by gcc (4.8+) or clang.
dnl http://clang.llvm.org/docs/AddressSanitizer.html dnl http://clang.llvm.org/docs/AddressSanitizer.html
dnl https://code.google.com/p/address-sanitizer/wiki/HowToBuild dnl https://code.google.com/p/address-sanitizer/wiki/HowToBuild
AC_ARG_ENABLE([test-asan], AC_ARG_ENABLE([test-asan],
[AS_HELP_STRING([--enable-test-asan], [Enable Address Sanitizer for tests of generated code])], [AS_HELP_STRING([--enable-test-asan], [Enable Address Sanitizer for tests of generated code])],
[enable_test_asan=$enableval], [enable_test_asan=no]) [enable_test_asan=$enableval], [enable_test_asan=no])
AS_IF([test "x$enable_asan" != xno], [ AS_IF([test "x$enable_test_asan" != xno], [
echo test asan1 [${enable_test_asan}]
AX_CHECK_COMPILE_FLAG([-fsanitize=address], AX_CHECK_COMPILE_FLAG([-fsanitize=address],
[SKELETONS_CFLAGS="${SKELETONS_CFLAGS} -fsanitize=address" [SKELETONS_CFLAGS="${SKELETONS_CFLAGS} -fsanitize=address"
TESTSUITE_CFLAGS="${TESTSUITE_CFLAGS} -fsanitize=address"], TESTSUITE_CFLAGS="${TESTSUITE_CFLAGS} -fsanitize=address"]
[enable_test_asan=no], []) [enable_test_asan=no])
AS_IF([test "x$enable_asan" = xno], [ AS_IF([test "x$enable_test_asan" = xno], [
AC_MSG_FAILURE( AC_MSG_FAILURE(
[--enable-test-asan is given, but not supported on this platform. [--enable-test-asan is given, but not supported on this platform.
Check out https://code.google.com/p/address-sanitizer/wiki/HowToBuild])]) Check out https://code.google.com/p/address-sanitizer/wiki/HowToBuild])])
......
CFLAGS = $(filter-out $(CODE_COVERAGE_CFLAGS), @CFLAGS@) CFLAGS = $(filter-out $(CODE_COVERAGE_CFLAGS), @CFLAGS@)
AM_CFLAGS = $(SKELETONS_CFLAGS)
dist_pkgdata_DATA = \ dist_pkgdata_DATA = \
${srcdir}/README \ ${srcdir}/README \
${srcdir}/*.[ch] \ ${srcdir}/*.[ch] \
...@@ -20,7 +22,6 @@ uninstall-local: ...@@ -20,7 +22,6 @@ uninstall-local:
check_LTLIBRARIES = libasn1cskeletons.la check_LTLIBRARIES = libasn1cskeletons.la
libasn1cskeletons_la_CFLAGS = $(SKELETONS_CFLAGS)
libasn1cskeletons_la_SOURCES = \ libasn1cskeletons_la_SOURCES = \
ANY.c ANY.h \ ANY.c ANY.h \
BIT_STRING.c BIT_STRING.h \ BIT_STRING.c BIT_STRING.h \
...@@ -92,6 +93,6 @@ libasn1cskeletons_la_SOURCES = \ ...@@ -92,6 +93,6 @@ libasn1cskeletons_la_SOURCES = \
check_PROGRAMS = check-converter_sample check_PROGRAMS = check-converter_sample
LDADD = -lm LDADD = -lm
check_converter_sample_CFLAGS = $(SKELETONS_CFLAGS) -DNO_ASN_PDU check_converter_sample_CFLAGS = -DNO_ASN_PDU
check_converter_sample_SOURCES = converter-sample.c check_converter_sample_SOURCES = converter-sample.c
check_converter_sample_LDADD = libasn1cskeletons.la check_converter_sample_LDADD = libasn1cskeletons.la
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment