From cedc824dea92e18dde0b2762ffbd762c112662db Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 1 Dec 2009 20:52:25 -0800 Subject: [PATCH] pandora-build v0.76 - synced with drizzle --- m4/pandora_canonical.m4 | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/m4/pandora_canonical.m4 b/m4/pandora_canonical.m4 index 1a0f15ff..f4d1634a 100644 --- a/m4/pandora_canonical.m4 +++ b/m4/pandora_canonical.m4 @@ -4,7 +4,7 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl Which version of the canonical setup we're using -AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.75]) +AC_DEFUN([PANDORA_CANONICAL_VERSION],[0.76]) AC_DEFUN([PANDORA_FORCE_DEPEND_TRACKING],[ dnl Force dependency tracking on for Sun Studio builds @@ -24,6 +24,7 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ m4_define([PCT_IGNORE_SHARED_PTR],[no]) m4_define([PCT_FORCE_GCC42],[no]) m4_define([PCT_SRC_IN_SRC],[no]) + m4_define([PCT_USE_VISIBILITY],[yes]) m4_foreach([pct_arg],[$*],[ m4_case(pct_arg, [use-gnulib], [ @@ -42,6 +43,10 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ m4_undefine([PCT_FORCE_GCC42]) m4_define([PCT_FORCE_GCC42],[yes]) ], + [skip-visibility], [ + m4_undefine([PCT_USE_VISIBILITY]) + m4_define([PCT_USE_VISIBILITY],[no]) + ], [src-in-src], [ m4_undefine([PCT_SRC_IN_SRC]) m4_define([PCT_SRC_IN_SRC],[yes]) @@ -185,11 +190,13 @@ AC_DEFUN([PANDORA_CANONICAL_TARGET],[ PANDORA_HAVE_GCC_ATOMICS - dnl We need to inject error into the cflags to test if visibility works or not - save_CFLAGS="${CFLAGS}" - CFLAGS="${CFLAGS} -Werror" - gl_VISIBILITY - CFLAGS="${save_CFLAGS}" + m4_if(PCT_USE_VISIBILITY,[yes],[ + dnl We need to inject error into the cflags to test if visibility works or not + save_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} -Werror" + gl_VISIBILITY + CFLAGS="${save_CFLAGS}" + ]) PANDORA_HEADER_ASSERT -- 2.30.2