From 458694809f0633be65695c2e845e2333652e4b91 Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Fri, 21 Sep 2012 13:23:26 -0400 Subject: [PATCH] Update m4 --- m4/ax_compiler_version.m4 | 36 +++++++++++++++++++++++ m4/ax_harden_compiler_flags.m4 | 27 +++++++++-------- m4/{ac_vc_build.m4 => ax_vcs_checkout.m4} | 3 +- m4/pandora_vc_build.m4 | 36 ----------------------- 4 files changed, 51 insertions(+), 51 deletions(-) create mode 100644 m4/ax_compiler_version.m4 rename m4/{ac_vc_build.m4 => ax_vcs_checkout.m4} (97%) delete mode 100644 m4/pandora_vc_build.m4 diff --git a/m4/ax_compiler_version.m4 b/m4/ax_compiler_version.m4 new file mode 100644 index 00000000..7f6708d5 --- /dev/null +++ b/m4/ax_compiler_version.m4 @@ -0,0 +1,36 @@ +AC_DEFUN([AX_C_COMPILER_VERSION],[ + + dnl Print version of C compiler + AC_MSG_CHECKING("C Compiler version--$GCC") + AS_IF([test "$GCC" = "yes"],[ + CC_VERSION=`$CC --version | sed 1q` ],[ + test "$SUNCC" = "yes"],[ + CC_VERSION=`$CC -V 2>&1 | sed 1q` ],[ + test "$CLANG" = "yes"],[ + CC_VERSION=`$CC --version 2>&1 | sed 1q` ],[ + CC_VERSION="" + ]) + AC_MSG_RESULT("$CC_VERSION") + AC_SUBST(CC_VERSION) + ]) + + +AC_DEFUN([AX_CXX_COMPILER_VERSION], [ + + dnl Check C version while at it + AC_REQUIRE([AX_C_COMPILER_VERSION]) + + dnl Print version of CXX compiler + AC_MSG_CHECKING("C++ Compiler version") + AS_IF([test "$GCC" = "yes"],[ + CXX_VERSION=`$CXX --version | sed 1q` ],[ + test "$SUNCC" = "yes"],[ + CXX_VERSION=`$CXX -V 2>&1 | sed 1q` ],[ + test "$CLANG" = "yes"],[ + CXX_VERSION=`$CXX --version 2>&1 | sed 1q` ],[ + CXX_VERSION="" + ]) + AC_MSG_RESULT("$CXX_VERSION") + AC_SUBST(CXX_VERSION) + ]) + diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4 index 7eecc0a1..ecb6f543 100644 --- a/m4/ax_harden_compiler_flags.m4 +++ b/m4/ax_harden_compiler_flags.m4 @@ -84,44 +84,44 @@ AX_APPEND_COMPILE_FLAGS([-Wall]) AX_APPEND_COMPILE_FLAGS([-Wextra]) + AX_APPEND_COMPILE_FLAGS([-std=c99]) AX_APPEND_COMPILE_FLAGS([-Wpragmas]) + AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast]) + AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes]) + AX_APPEND_COMPILE_FLAGS([-Wnested-externs]) + AX_APPEND_COMPILE_FLAGS([-Wold-style-definition]) + AX_APPEND_COMPILE_FLAGS([-Woverride-init]) + AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes]) + AX_APPEND_COMPILE_FLAGS([-Wlogical-op]) AX_APPEND_COMPILE_FLAGS([--paramssp-buffer-size=1]) AX_APPEND_COMPILE_FLAGS([-Waddress]) AX_APPEND_COMPILE_FLAGS([-Warray-bounds]) - AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast]) AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts]) AX_APPEND_COMPILE_FLAGS([-Wcomment]) - AX_APPEND_COMPILE_FLAGS([-Wctor-dtor-privacy]) AX_APPEND_COMPILE_FLAGS([-Wfloat-equal]) AX_APPEND_COMPILE_FLAGS([-Wformat=2]) - AX_APPEND_COMPILE_FLAGS([-Wlogical-op]) AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized]) AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers]) AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn]) - AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes]) - AX_APPEND_COMPILE_FLAGS([-Wnested-externs]) - AX_APPEND_COMPILE_FLAGS([-Wnon-virtual-dtor]) + AX_APPEND_COMPILE_FLAGS([-Wlogical-op]) AX_APPEND_COMPILE_FLAGS([-Wnormalized=id]) - AX_APPEND_COMPILE_FLAGS([-Wold-style-definition]) - AX_APPEND_COMPILE_FLAGS([-Woverloaded-virtual]) - AX_APPEND_COMPILE_FLAGS([-Woverride-init]) AX_APPEND_COMPILE_FLAGS([-Wpointer-arith]) AX_APPEND_COMPILE_FLAGS([-Wredundant-decls]) AX_APPEND_COMPILE_FLAGS([-Wshadow]) AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32]) AX_APPEND_COMPILE_FLAGS([-Wsign-compare]) AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1]) - AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes]) AX_APPEND_COMPILE_FLAGS([-Wswitch-enum]) AX_APPEND_COMPILE_FLAGS([-Wundef]) + AX_APPEND_COMPILE_FLAGS([-Wc++-compat]) + AX_APPEND_COMPILE_FLAGS([-Wpointer-sign]) AX_APPEND_COMPILE_FLAGS([-Wunused-result]) AX_APPEND_COMPILE_FLAGS([-Wunused-variable]) AX_APPEND_COMPILE_FLAGS([-Wwrite-strings]) - AX_APPEND_COMPILE_FLAGS([-fPIE]) + AX_APPEND_COMPILE_FLAGS([-Wformat-security]) AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all]) AX_APPEND_COMPILE_FLAGS([-fwrapv]) AX_APPEND_COMPILE_FLAGS([-ggdb]) - AX_APPEND_COMPILE_FLAGS([-std=c99]) AC_LANG_POP ]) @@ -166,12 +166,13 @@ AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1]) AX_APPEND_COMPILE_FLAGS([-Wswitch-enum]) AX_APPEND_COMPILE_FLAGS([-Wundef]) + AX_APPEND_COMPILE_FLAGS([-Wc++11-compat]) AX_APPEND_COMPILE_FLAGS([-Wunused-result]) AX_APPEND_COMPILE_FLAGS([-Wunused-variable]) AX_APPEND_COMPILE_FLAGS([-Wwrite-strings]) + AX_APPEND_COMPILE_FLAGS([-Wformat-security]) AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all]) AX_APPEND_COMPILE_FLAGS([-fwrapv]) - AX_APPEND_COMPILE_FLAGS([-fPIE]) AX_APPEND_COMPILE_FLAGS([-ggdb]) AC_LANG_POP ]) diff --git a/m4/ac_vc_build.m4 b/m4/ax_vcs_checkout.m4 similarity index 97% rename from m4/ac_vc_build.m4 rename to m4/ax_vcs_checkout.m4 index e354470e..08bd3746 100644 --- a/m4/ac_vc_build.m4 +++ b/m4/ax_vcs_checkout.m4 @@ -55,6 +55,5 @@ AC_DEFUN([AX_VCS_CHECKOUT],[ AS_IF([test -d ".git"],[ac_cv_vcs_checkout=yes]) ]) - AS_IF([test "$ac_cv_vcs_checkout" = yes], [ - ]) + AS_IF([test "$ac_cv_vcs_checkout" = yes], []) ]) diff --git a/m4/pandora_vc_build.m4 b/m4/pandora_vc_build.m4 deleted file mode 100644 index 1adb2809..00000000 --- a/m4/pandora_vc_build.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl Copyright (C) 2009 Sun Microsystems, Inc. -dnl This file is free software; Sun Microsystems, Inc. -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([PANDORA_TEST_VC_DIR],[ - pandora_building_from_vc=no - - if test -d ".bzr" ; then - pandora_building_from_bzr=yes - pandora_building_from_vc=yes - else - pandora_building_from_bzr=no - fi - - if test -d ".svn" ; then - pandora_building_from_svn=yes - pandora_building_from_vc=yes - else - pandora_building_from_svn=no - fi - - if test -d ".hg" ; then - pandora_building_from_hg=yes - pandora_building_from_vc=yes - else - pandora_building_from_hg=no - fi - - if test -d ".git" ; then - pandora_building_from_git=yes - pandora_building_from_vc=yes - else - pandora_building_from_git=no - fi -]) -- 2.30.2