commit 56d4c03cb2971701db716f80a4d8bd5febce429a
author Trent Nelson <trent@trent.me> Tue Oct 16 11:07:31 2012 -0400
committer Trent Nelson <trent@trent.me> Tue Oct 16 11:07:31 2012 -0400
tree 5a902daa056e5a3d7b618e646ba530ed8e8cc821
parent d6d5cf33ef7ad248a0baa2568f2a15a265a73734
parent 6603118125164b927d79eab89263a07a12406481

Merge issue #15819: tweak logic in previous commit.

configure

diff --git a/configure b/configure
index 843b141..a619bb3 100755
--- a/configure
+++ b/configure
@@ -2724,7 +2724,7 @@
 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

configure.ac

diff --git a/configure.ac b/configure.ac
index 0633a97..04413e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 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