From 9b83bdb0b367d47a1c76cfdc575335c2838241c4 Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@gahr.ch>
Date: Sat, 17 Mar 2018 09:24:49 +0100
Subject: [PATCH] =?UTF-8?q?Support=20=E2=80=94with-sysroot=20configure=20a?=
 =?UTF-8?q?rg=20(#1101)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* If --sysroot is given, prepend it to prefix for search paths

Issue #869

* Prefix is not used inside Makefiles

Issue #869

* No need to specify the empty string as opt-val's default return

Issue #869

* s/--sysroot/--with-sysroot/

Issue #869
---
 Makefile.autosetup | 1 -
 auto.def           | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.autosetup b/Makefile.autosetup
index fb6b83dfa5e..55552db55a0 100644
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -38,7 +38,6 @@ LIBBINFILES+=	$(SRCDIR)/contrib/smime_keys
 @endif
 
 # paths
-prefix=		@prefix@
 bindir=		@BINDIR@
 datadir=	@PKGDATADIR@
 docdir=		@PKGDOCDIR@
diff --git a/auto.def b/auto.def
index d922490d7dc..c871159e47e 100644
--- a/auto.def
+++ b/auto.def
@@ -85,6 +85,8 @@ options {
   with-qdbm:path            => "Location of QDBM"
   tokyocabinet=0            => "Use TokyoCabinet for the header cache"
   with-tokyocabinet:path    => "Location of TokyoCabinet"
+# System
+  with-sysroot:path         => "Target system root"
 # Enable all options
   everything=0              => "Enable all options"
 }
@@ -294,7 +296,7 @@ define USE_SOCKET
 define SUN_ATTACHMENT
 ###############################################################################
 
-set prefix [get-define prefix]
+set prefix [opt-val with-sysroot][get-define prefix]
 
 ###############################################################################
 # Everything