Support —with-sysroot configure arg (#1101)

* 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

diff --git a/Makefile.autosetup b/Makefile.autosetup
index fb6b83dfa5e392808666fd5dde262f42c54a5392..55552db55a0e6147f4baf4b40875eb44e9421768 100644 (file)
--- 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 d922490d7dc0309cea3d38bec04560ba81986e1d..c871159e47e76803d94f63b9ec31d3b0f31b92dc 100644 (file)
--- 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