From: Kay Sievers <kay@vrfy.org>
Date: Tue, 29 Mar 2016 17:16:10 +0000 (+0200)
Subject: build: work around autoconf magic
X-Git-Url: https://git.zarvox.org/shortlog/month?a=commitdiff_plain;h=9ceeef2471adb2b057d7ab768711e2174fac25bf;p=crbtree.git

build: work around autoconf magic
---

diff --git a/configure.ac b/configure.ac
index 24a453a..2914400 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,9 @@ AC_CONFIG_MACRO_DIR([build/m4])
 AC_CONFIG_HEADERS([build/config.h])
 AC_CONFIG_AUX_DIR([build/build-aux])
 
+# AC_PROG_CC sets default CFLAGS which conflict with our own configuration
+CFLAGS_SAVE=$CFLAGS
+
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AM_MAINTAINER_MODE([enable])
@@ -27,7 +30,8 @@ AC_PROG_CC_C99
 AC_PROG_RANLIB
 AC_PROG_SED
 
-AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
+CFLAGS=$CFLAGS_SAVE
+
 m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config])
 
 # ------------------------------------------------------------------------------
@@ -47,7 +51,7 @@ OUR_CFLAGS=${OUR_CFLAGS:-$(echo \
         -fdata-sections \
         -fstack-protector \
         -fstack-protector-strong \
-        -fPIE \
+        -fPIC \
         --param=ssp-buffer-size=4 \
         -Wall \
         -Wextra \