From 6603118125164b927d79eab89263a07a12406481 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Tue, 16 Oct 2012 11:04:04 -0400 Subject: [PATCH] Issue #15819: tweak logic in previous commit (617591e7d708). --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 8ba3dec51fd..b90c6617688 100755 --- a/configure +++ b/configure @@ -5210,7 +5210,7 @@ fi BUILDDIR="`pwd`" -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc diff --git a/configure.ac b/configure.ac index 9222c887c30..116e03e471b 100644 --- a/configure.ac +++ b/configure.ac @@ -833,7 +833,7 @@ fi BUILDDIR="`pwd`" AC_SUBST(BUILDDIR) AC_SUBST(BASECPPFLAGS) -if test "$srcdir" != "$BUILDDIR"; then +if test "$srcdir" != "." -a "$srcdir" != "$BUILDDIR"; then # If we're building out-of-tree, we need to make sure the following # resources get picked up before their $srcdir counterparts. # Objects/ -> typeslots.inc