From 29bfaf7a0a6cb14a2cfca1d8719f1447937d01c6 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Mon, 17 Sep 2012 05:52:51 -0400 Subject: [PATCH] Fix autoconf warnings. --- config/autorun.sh | 7 +++- configure.ac | 6 ++-- m4/ac_vc_build.m4 | 60 ++++++++++++++++++++++++++++++++++ m4/ax_harden_compiler_flags.m4 | 4 +-- m4/check_sock_cloexec.m4 | 5 +-- 5 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 m4/ac_vc_build.m4 diff --git a/config/autorun.sh b/config/autorun.sh index ed08d182..27fcf170 100755 --- a/config/autorun.sh +++ b/config/autorun.sh @@ -49,7 +49,12 @@ locate_binary() { } -AUTORECONF_FLAGS=" --install --verbose -Wall" +if test -d .bzr +then + AUTORECONF_FLAGS=" --install --verbose -Wall -Werror" +else + AUTORECONF_FLAGS=" --install --verbose -Wall" +fi if test -f config/pre_hook.sh then diff --git a/configure.ac b/configure.ac index 48e81d02..07c77c5a 100644 --- a/configure.ac +++ b/configure.ac @@ -288,7 +288,7 @@ AX_CHECK_SOCK_CLOEXEC([AC_DEFINE([HAVE_SOCK_CLOEXEC], [1], [Check for SOCK_CLOEX AX_PTHREAD(, [AC_MSG_ERROR(could not find libpthread)]) -AX_HARDEN_COMPILER_FLAGS +AX_HARDEN_CC_COMPILER_FLAGS AX_DEBUG @@ -313,8 +313,8 @@ echo " * System type: $host_vendor-$host_os" echo " * Host CPU: $host_cpu" echo " * C Compiler: $CC_VERSION" echo " * C Flags: $CFLAGS" -echo " * C++ Compiler: $CXX" -echo " * C++ Flags: $CXX_VERSION" +echo " * C++ Compiler: $CXX_VERSION" +echo " * C++ Flags: $CXXFLAGS" echo " * CPP Flags: $CPPFLAGS" echo " * Assertions enabled: $ac_cv_assert" echo " * Debug enabled: $with_debug" diff --git a/m4/ac_vc_build.m4 b/m4/ac_vc_build.m4 new file mode 100644 index 00000000..e354470e --- /dev/null +++ b/m4/ac_vc_build.m4 @@ -0,0 +1,60 @@ +# =========================================================================== +# http:// +# =========================================================================== +# +# SYNOPSIS +# +# AX_VCS_CHECKOUT +# +# DESCRIPTION +# +# Discover whether or not we are operating with a tree which +# has been checked out of a version control system. +# +# +# LICENSE +# +# Copyright (C) 2012 Brian Aker +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# +# * The names of its contributors may not be used to endorse or +# promote products derived from this software without specific prior +# written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#serial 1 + +AC_DEFUN([AX_VCS_CHECKOUT],[ + AC_CACHE_CHECK([for vcs checkout], [ac_cv_vcs_checkout], [ + AS_IF([test -d ".bzr"],[ac_cv_vcs_checkout=yes]) + AS_IF([test -d ".svn"],[ac_cv_vcs_checkout=yes]) + AS_IF([test -d ".hg"], [ac_cv_vcs_checkout=yes]) + AS_IF([test -d ".git"],[ac_cv_vcs_checkout=yes]) + ]) + + AS_IF([test "$ac_cv_vcs_checkout" = yes], [ + ]) + ]) diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4 index 4cdf0147..a8e1e83b 100644 --- a/m4/ax_harden_compiler_flags.m4 +++ b/m4/ax_harden_compiler_flags.m4 @@ -51,8 +51,9 @@ # AX_APPEND_COMPILE_FLAGS([-pedantic]) -- ? # AX_APPEND_COMPILE_FLAGS([-Wstack-protector]) -- Issues on 32bit compile # AX_APPEND_COMPILE_FLAGS([-fstack-protector-all]) -- Issues on 32bit compile +# AX_APPEND_COMPILE_FLAGS([-Wlong-long]) -- Don't turn on for compatibility issues memcached_stat_st -#serial 1 +#serial 2 AC_DEFUN([AX_HARDEN_C_COMPILER_FLAGS], [ AC_REQUIRE([AX_APPEND_COMPILE_FLAGS]) @@ -91,7 +92,6 @@ AX_APPEND_COMPILE_FLAGS([-Wctor-dtor-privacy]) AX_APPEND_COMPILE_FLAGS([-Wfloat-equal]) AX_APPEND_COMPILE_FLAGS([-Wformat=2]) - AX_APPEND_COMPILE_FLAGS([-Wlong-long]) AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized]) AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers]) AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn]) diff --git a/m4/check_sock_cloexec.m4 b/m4/check_sock_cloexec.m4 index 6936ab40..8dcd14f5 100644 --- a/m4/check_sock_cloexec.m4 +++ b/m4/check_sock_cloexec.m4 @@ -2,7 +2,7 @@ # AX_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found]) # -#serial 1 +#serial 2 AC_DEFUN([AX_CHECK_SOCK_CLOEXEC], [ AC_CACHE_CHECK([whether SOCK_CLOEXEC is supported], [ax_cv_sock_cloexec], [ @@ -19,7 +19,8 @@ AC_DEFUN([AX_CHECK_SOCK_CLOEXEC], [ return (s == -1); ])], [ax_cv_sock_cloexec=yes], - [ax_cv_sock_cloexec=no]) + [ax_cv_sock_cloexec=no], + [AC_MSG_WARN([test program execution failed])]) ]) AS_IF([test x"ax_cv_sock_cloexec" = xyes], [AC_MSG_RESULT([yes]) ; $1], AC_MSG_RESULT([no]) ; $2) -- 2.30.2