From d24247edcbe23a15968961c673df1ac5e5ea5120 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Tue, 19 May 2015 15:58:58 +0200
Subject: [PATCH] build: try -Wl,-pie before trying -pie for clang

---
 configure.ac           | 3 ++-
 m4/ax_ld_check_flag.m4 | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce240c1b..190a6df6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,7 +292,8 @@ if test x"$hardening" != x"no"; then
   AX_CFLAGS_GCC_OPTION([-D_FORTIFY_SOURCE=2], [LLDP_CPPFLAGS])
   if test x"$LIBEVENT_EMBEDDED" = x; then
     AX_CFLAGS_GCC_OPTION([-fPIE], [LLDP_CFLAGS])
-    AX_LDFLAGS_OPTION([-fPIE -pie], [LLDP_LDFLAGS])
+    AX_LDFLAGS_OPTION([-fPIE -Wl,-pie], [LLDP_LDFLAGS],
+      [AX_LDFLAGS_OPTION([-fPIE -pie], [LLDP_LDFLAGS])])
   fi
 fi
 
diff --git a/m4/ax_ld_check_flag.m4 b/m4/ax_ld_check_flag.m4
index 4d59c9d1..123c4507 100644
--- a/m4/ax_ld_check_flag.m4
+++ b/m4/ax_ld_check_flag.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_LDFLAGS_OPTION(FLAG-TO-CHECK,[VAR])
+#   AX_LDFLAGS_OPTION(FLAG-TO-CHECK,[VAR],[NOTFOUND])
 #
 # DESCRIPTION
 #
@@ -79,5 +79,7 @@ AC_DEFUN([AX_LDFLAGS_OPTION],[
 
   AS_IF([eval "test \"`echo '$ax_cv_ld_check_flag_'$flag`\" = yes"],[
     m4_ifval($2,$2,LDFLAGS)="$[]m4_ifval($2,$2,LDFLAGS) $1"
+  ],[
+    :; $3
   ])
 ])
-- 
2.39.5