From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 23 Mar 2018 16:38:27 +0000 (-0400)
Subject: Define SRCDIR more correctly in configure.ac
X-Git-Tag: tor-0.3.4.1-alpha~214
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=398bef2592010e71692dd9c3b5b90d3751c48bb2;p=thirdparty%2Ftor.git

Define SRCDIR more correctly in configure.ac

Without this fix, we were just getting SRCDIR=`pwd`, which naturally
was breaking out-of-tree builds.

Bugfix on becae4c943969a4f4f14423cc897d39f41af7773; bug not in any
released Tor.
---

diff --git a/configure.ac b/configure.ac
index 6fadc21df4..d7cc05c098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1879,7 +1879,7 @@ AH_TEMPLATE([BUILDDIR],[tor's build directory])
 AC_DEFINE_UNQUOTED(BUILDDIR,"$BUILDDIR")
 
 if test "x$SRCDIR" = "x"; then
-  SRCDIR=`pwd`
+  SRCDIR=$(cd "$srcdir"; pwd)
 fi
 AH_TEMPLATE([SRCDIR],[tor's sourcedir directory])
 AC_DEFINE_UNQUOTED(SRCDIR,"$SRCDIR")