From: Brian Aker Date: Mon, 17 Sep 2012 09:05:33 +0000 (-0400) Subject: Fixing a couple of items before releasing. X-Git-Tag: 1.0.12~23^2~12 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=558dbc482b4285c064b15b7d6889a7e2860c96f2;p=m6w6%2Flibmemcached Fixing a couple of items before releasing. --- diff --git a/configure.ac b/configure.ac index 1cab94d7..48e81d02 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ # Use and distribution licensed under the BSD license. See # the COPYING file in this directory for full text. -AC_INIT([libmemcached],[1.0.10],[http://libmemcached.org/]) +AC_INIT([libmemcached],[1.0.11],[http://libmemcached.org/]) AC_CONFIG_AUX_DIR([config]) @@ -312,6 +312,10 @@ echo " * Installation prefix: $prefix" 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 " * CPP Flags: $CPPFLAGS" echo " * Assertions enabled: $ac_cv_assert" echo " * Debug enabled: $with_debug" echo " * Warnings as failure: $ac_cv_warnings_as_errors" diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index 81d46149..9f6d514c 100644 --- a/m4/pandora_canonical.m4 +++ b/m4/pandora_canonical.m4 @@ -125,7 +125,6 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ AC_CONFIG_LIBOBJ_DIR([gnulib]) ]) - PANDORA_CHECK_C_VERSION PANDORA_CHECK_CXX_VERSION AC_HEADER_TIME diff --git a/m4/pandora_check_compiler_version.m4 b/m4/pandora_check_compiler_version.m4 index f39174ed..f490ef27 100644 --- a/m4/pandora_check_compiler_version.m4 +++ b/m4/pandora_check_compiler_version.m4 @@ -6,32 +6,36 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([PANDORA_CHECK_C_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` - ],[AS_IF([test "$SUNCC" = "yes"],[ - CC_VERSION=`$CC -V 2>&1 | sed 1q` - ],[ + 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_MSG_RESULT("$CC_VERSION") - AC_SUBST(CC_VERSION) -]) AC_DEFUN([PANDORA_CHECK_CXX_VERSION], [ - dnl Print version of CXX compiler - AC_MSG_CHECKING("C++ Compiler version") - AS_IF([test "$GCC" = "yes"],[ - CXX_VERSION=`$CXX --version | sed 1q` - ],[AS_IF([test "$SUNCC" = "yes"],[ - CXX_VERSION=`$CXX -V 2>&1 | sed 1q` - ],[ - CXX_VERSION="" - ]) + + dnl Check C version while at it + AC_REQUIRE([PANDORA_CHECK_C_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) ]) - AC_MSG_RESULT("$CXX_VERSION") - AC_SUBST(CXX_VERSION) -]) diff --git a/m4/pandora_platform.m4 b/m4/pandora_platform.m4 index bd570f61..ee361c71 100644 --- a/m4/pandora_platform.m4 +++ b/m4/pandora_platform.m4 @@ -94,6 +94,7 @@ AC_DEFUN([PANDORA_PLATFORM],[ AC_SUBST(PANDORA_OPTIMIZE_BITFIELD) + AC_CHECK_DECL([__clang__], [CLANG="yes"], [CLANG="no"]) AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) AC_CHECK_DECL([__ICC], [INTELCC="yes"], [INTELCC="no"])