From b3377a0583b50ca2c0d8be49f4f025104ac512f8 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 7 Mar 2013 16:41:59 +0100 Subject: [PATCH v2 05/18] build: Namespace local macros with NEARD_ instead of none or AC_ Status: obsolete Do not take over the autoconf namespace, as it might stomp with macros provided in the future. --- acinclude.m4 | 10 +++++----- configure.ac | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 329c6a9..fbc7660 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,16 +1,16 @@ -AC_DEFUN([AC_PROG_CC_PIE], [ - AC_CACHE_CHECK([whether ${CC-cc} accepts -fPIE], ac_cv_prog_cc_pie, [ +AC_DEFUN([NEARD_PROG_CC_PIE], [ + AC_CACHE_CHECK([whether ${CC-cc} accepts -fPIE], neard_cv_prog_cc_pie, [ echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -fPIE -pie -c conftest.c 2>&1`"; then - ac_cv_prog_cc_pie=yes + neard_cv_prog_cc_pie=yes else - ac_cv_prog_cc_pie=no + neard_cv_prog_cc_pie=no fi rm -rf conftest* ]) ]) -AC_DEFUN([COMPILER_FLAGS], [ +AC_DEFUN([NEARD_COMPILER_FLAGS], [ if (test "${CFLAGS}" = ""); then CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2" fi diff --git a/configure.ac b/configure.ac index cb4bc8f..9dd59c2 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ plugindir="${libdir}/near/plugins" PKG_PROG_PKG_CONFIG -COMPILER_FLAGS +NEARD_COMPILER_FLAGS AC_LANG_C AC_PROG_CC -AC_PROG_CC_PIE +NEARD_PROG_CC_PIE AC_PROG_INSTALL m4_define([_LT_AC_TAGCONFIG], []) -- 1.8.3.1