Skip to content

Commit

Permalink
Add --enable-werror option to configure to enable warning flags
Browse files Browse the repository at this point in the history
  • Loading branch information
tatsuhiro-t committed Jan 22, 2016
1 parent 59beb64 commit dda0b62
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 2 deletions.
16 changes: 16 additions & 0 deletions configure.ac
Expand Up @@ -75,6 +75,7 @@ ARIA2_ARG_DISABLE([metalink])
ARIA2_ARG_DISABLE([websocket])
ARIA2_ARG_DISABLE([epoll])
ARIA2_ARG_ENABLE([libaria2])
ARIA2_ARG_ENABLE([werror])

AC_ARG_WITH([ca-bundle],
AS_HELP_STRING([--with-ca-bundle=FILE],[Use FILE as default CA bundle.]),
Expand Down Expand Up @@ -1117,6 +1118,20 @@ AC_SUBST([EXTRACPPFLAGS])
AC_SUBST([EXTRALDFLAGS])
AC_SUBST([EXTRALIBS])

old_CXXFLAGS=$CXXFLAGS
CXXFLAGS=

if test "x$enable_werror" = "xyes"; then
AX_CHECK_COMPILE_FLAG([-Wall], [CXXFLAGS="$CXXFLAGS -Wall"])
AX_CHECK_COMPILE_FLAG([-Werror], [CXXFLAGS="$CXXFLAGS -Werror"])
AX_CHECK_COMPILE_FLAG([-Wformat-security], [CXXFLAGS="$CXXFLAGS -Wformat-security"])
fi

WARNCXXFLAGS=$CXXFLAGS
CXXFLAGS=$old_CXXFLAGS

AC_SUBST([WARNCXXFLAGS])

AC_CONFIG_FILES([Makefile
src/Makefile
src/libaria2.pc
Expand Down Expand Up @@ -1155,6 +1170,7 @@ EXTRACFLAGS: $EXTRACFLAGS
EXTRACPPFLAGS: $EXTRACPPFLAGS
EXTRALDFLAGS: $EXTRALDFLAGS
EXTRALIBS: $EXTRALIBS
WARNCXXFLAGS: $WARNCXXFLAGS
LibUV: $have_libuv (CFLAGS='$LIBUV_CFLAGS' LIBS='$LIBUV_LIBS')
SQLite3: $have_sqlite3 (CFLAGS='$SQLITE3_CFLAGS' LIBS='$SQLITE3_LIBS')
SSL Support: $have_ssl
Expand Down
74 changes: 74 additions & 0 deletions m4/ax_check_compile_flag.m4
@@ -0,0 +1,74 @@
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
# ===========================================================================
#
# SYNOPSIS
#
# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT])
#
# DESCRIPTION
#
# Check whether the given FLAG works with the current language's compiler
# or gives an error. (Warnings, however, are ignored)
#
# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
# success/failure.
#
# If EXTRA-FLAGS is defined, it is added to the current language's default
# flags (e.g. CFLAGS) when the check is done. The check is thus made with
# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to
# force the compiler to issue an error when a bad flag is given.
#
# INPUT gives an alternative input source to AC_COMPILE_IFELSE.
#
# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
#
# LICENSE
#
# Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
# Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
#
# This program is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
# Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
#
# As a special exception, the respective Autoconf Macro's copyright owner
# gives unlimited permission to copy, distribute and modify the configure
# scripts that are the output of Autoconf when processing the Macro. You
# need not follow the terms of the GNU General Public License when using
# or distributing such scripts, even though portions of the text of the
# Macro appear in them. The GNU General Public License (GPL) does govern
# all other use of the material that constitutes the Autoconf Macro.
#
# This special exception to the GPL applies to versions of the Autoconf
# Macro released by the Autoconf Archive. When you make and distribute a
# modified version of the Autoconf Macro, you may extend this special
# exception to the GPL to apply to your modified version as well.

#serial 4

AC_DEFUN([AX_CHECK_COMPILE_FLAG],
[AC_PREREQ(2.64)dnl for _AC_LANG_PREFIX and AS_VAR_IF
AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
_AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
[AS_VAR_SET(CACHEVAR,[yes])],
[AS_VAR_SET(CACHEVAR,[no])])
_AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
AS_VAR_IF(CACHEVAR,yes,
[m4_default([$2], :)],
[m4_default([$3], :)])
AS_VAR_POPDEF([CACHEVAR])dnl
])dnl AX_CHECK_COMPILE_FLAGS
2 changes: 1 addition & 1 deletion src/Makefile.am
Expand Up @@ -763,5 +763,5 @@ LDADD = libaria2.la @ALLOCA@ \

AM_CFLAGS = @EXTRACFLAGS@

AM_CXXFLAGS = @EXTRACXXFLAGS@
AM_CXXFLAGS = @WARNCXXFLAGS@ @EXTRACXXFLAGS@

2 changes: 1 addition & 1 deletion test/Makefile.am
Expand Up @@ -294,7 +294,7 @@ AM_LDFLAGS = \

AM_CFLAGS = @EXTRACFLAGS@

AM_CXXFLAGS = @EXTRACXXFLAGS@
AM_CXXFLAGS = @WARNCXXFLAGS@ @EXTRACXXFLAGS@

EXTRA_DIST = 4096chunk.txt\
chunkChecksumTestFile250.txt\
Expand Down

0 comments on commit dda0b62

Please sign in to comment.