Fix option names in documentation and help messages.

[platform/upstream/flac.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b4c5c93..8b6edcb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ AC_PROG_MAKE_SET
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
+AC_CHECK_SIZEOF(off_t,1)       # Fake default value.
 AC_CHECK_SIZEOF([void*])
 AC_SEARCH_LIBS([lround],[m], [AC_DEFINE(HAVE_LROUND,1,lround support)])
 
@@ -234,7 +235,10 @@ fi
 AC_SUBST(FLAC__TEST_LEVEL)
 
 AC_ARG_ENABLE(gcc-werror,
-       AC_HELP_STRING([--enable-gcc-werror], [enable -Werror in all Makefiles]))
+       AC_HELP_STRING([--enable-gcc-werror], [Enable -Werror in all Makefiles]))
+
+AC_ARG_ENABLE(stack-smash-protection,
+       AC_HELP_STRING([--enable-stack-smash-protection], [Enable GNU GCC stack smash protection]))
 
 AC_ARG_ENABLE(valgrind-testing,
 AC_HELP_STRING([--enable-valgrind-testing], [Run all tests inside Valgrind]),
@@ -357,9 +361,13 @@ fi
 XIPH_GCC_VERSION
 
 if test x$ac_cv_c_compiler_gnu = xyes ; then
+       CFLAGS="$CFLAGS -Wstrict-prototypes -Wmissing-prototypes -Waggregate-return -Wcast-align -Wnested-externs -Wshadow -Wundef -Wmissing-declarations " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Winline -Wconversion
+       CXXFLAGS="$CXXFLAGS -Wcast-align -Wshadow -Wwrite-strings -Wctor-dtor-privacy -Wnon-virtual-dtor -Wreorder -Wsign-promo -Wundef " # -Wcast-qual -Wbad-function-cast -Wwrite-strings -Woverloaded-virtual -Wmissing-declarations
+
+
        if test x$enable_gcc_werror = "xyes" ; then
-               CFLAGS="-Wall -Wextra -Werror $CFLAGS"
-               CXXFLAGS="-Wall -Wextra -Werror $CXXFLAGS"
+               CFLAGS="$CFLAGS -Wall -Wextra -Werror "
+               CXXFLAGS="$CXXFLAGS -Wall -Wextra -Werror "
                fi
 
        if test "$GCC_MAJOR_VERSION" -ge 4 && test "$OBJ_FORMAT" = elf; then
@@ -375,16 +383,13 @@ if test x$ac_cv_c_compiler_gnu = xyes ; then
 
 
 XIPH_ADD_CFLAGS([-Wextra])
+XIPH_ADD_CFLAGS([-Wdeclaration-after-statement])
 XIPH_ADD_CFLAGS([-D_FORTIFY_SOURCE=2])
 
-case "$host_os" in
-       mingw32msvc | mingw32 | freebsd* )
-               # Stack protector not working on these platforms 2013/03/09.
-               ;;
-       *)
-               XIPH_ADD_CFLAGS([-fstack-protector --param ssp-buffer-size=4])
-               ;;
-       esac
+if test x$enable_stack_smash_protection = "xyes" ; then
+       XIPH_GCC_STACK_PROTECTOR
+       XIPH_GXX_STACK_PROTECTOR
+       fi
 
 #@@@
 AM_CONDITIONAL(FLaC__HAS_AS__TEMPORARILY_DISABLED, test "yes" = "no")