From 8f7d3958cb05141665415802fb8c34ec679a5994 Mon Sep 17 00:00:00 2001
From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Mon, 26 Nov 2018 09:44:49 +0200
Subject: [PATCH] configure: Stop using DOVECOT_CFLAGS and LDFLAGS

Instead use the detected ones.
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index b00092bed..551cddf68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,10 +34,10 @@ AC_PROG_LIBTOOL
 DC_DOVECOT
 DC_DOVECOT_MODULEDIR
 LIBDOVECOT_INCLUDE="$LIBDOVECOT_INCLUDE $LIBDOVECOT_STORAGE_INCLUDE"
-CFLAGS="$DOVECOT_CFLAGS -I\$(top_srcdir)"
+CFLAGS="$CFLAGS -I\$(top_srcdir)"
 LIBS="$DOVECOT_LIBS"
-BINARY_CFLAGS="$DOVECOT_BINARY_CFLAGS"
-BINARY_LDFLAGS="$DOVECOT_BINARY_LDFLAGS"
+BINARY_LDFLAGS="$PIE_LDFLAGS $RELRO_LDFLAGS"
+BINARY_CFLAGS="$PIE_CFLAGS"
 AC_SUBST(BINARY_CFLAGS)
 AC_SUBST(BINARY_LDFLAGS)
 AC_SUBST(LIBDOVECOT_INCLUDE)
-- 
GitLab