From 008a26c4893eb2ca5c15fe31e5476a77333e64d4 Mon Sep 17 00:00:00 2001
From: Viktor Dukhovni <viktor@twosigma.com>
Date: Wed, 15 Mar 2017 16:57:43 -0400
Subject: [PATCH] Leave srcdir as-as and use absolute form only as needed

---
 configure.ac           | 2 --
 tests/gss/Makefile.am  | 4 +++-
 tests/gss/krb5.conf.in | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 793196a28..c60d35741 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,6 @@ AC_CONFIG_SRCDIR([kuser/kinit.c])
 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_MACRO_DIR([cf])
 
-srcdir=`cd "$srcdir" && pwd || echo "$srcdir"`
-
 AM_INIT_AUTOMAKE([foreign 1.11])
 AM_MAINTAINER_MODE
 
diff --git a/tests/gss/Makefile.am b/tests/gss/Makefile.am
index 472dd1a74..9bd908be3 100644
--- a/tests/gss/Makefile.am
+++ b/tests/gss/Makefile.am
@@ -12,7 +12,9 @@ check_SCRIPTS = $(SCRIPT_TESTS)
 
 port = 49188
 
-do_subst = $(heim_verbose)sed -e 's,[@]srcdir[@],$(srcdir),g' \
+do_subst = srcdirabs=`cd "$(srcdir)"; pwd`; $(heim_verbose)sed \
+	-e 's,[@]srcdir[@],$(srcdir),g' \
+	-e "s,[@]srcdirabs[@],$${srcdirabs},g" \
 	-e 's,[@]env_setup[@],$(top_builddir)/tests/bin/setup-env,g' \
 	-e 's,[@]port[@],$(port),g' \
 	-e 's,[@]objdir[@],$(top_builddir)/tests/gss,g'
diff --git a/tests/gss/krb5.conf.in b/tests/gss/krb5.conf.in
index d6b9a066e..bfdf5aef5 100644
--- a/tests/gss/krb5.conf.in
+++ b/tests/gss/krb5.conf.in
@@ -1,4 +1,4 @@
-include @srcdir@/include-krb5.conf
+include @srcdirabs@/include-krb5.conf
 
 [libdefaults]
 	default_keytab_name = @objdir@/server.keytab
-- 
2.11.4.GIT