From: Aki Tuomi <cmouse@desteem.org>
Date: Mon, 15 Dec 2014 14:11:00 +0000 (+0200)
Subject: Handle error without set +e
X-Git-Tag: rec-3.7.0-rc1~109^2~13^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6f612f0738337f0e9499b53bf2cc1f668c51fb5;p=thirdparty%2Fpdns.git

Handle error without set +e
---

diff --git a/pdns/configure-recursor b/pdns/configure-recursor
index 2882ba0c84..7dd0d713b0 100755
--- a/pdns/configure-recursor
+++ b/pdns/configure-recursor
@@ -68,9 +68,7 @@ test_flags
 
 sed -e "s/@CF_PIE@/$CF_PIE/g" -e "s/@LD_PIE@/$LD_PIE/g" -e "s/@CF_FORTIFY@/$CF_FORTIFY/g"  -e "s/@CF_STACK@/$CF_STACK/g" -e "s/@LD_RELRO@/$LD_RELRO/g" < Makefile.in > Makefile
 
-set +e
-GMAKE=`which gmake`
-set -e
+GMAKE=$(which gmake || echo "")
 
 if test -z "$GMAKE"
 then