changeset:   79759:5707c8a36cc0
branch:      3.2
parent:      79748:617591e7d708
user:        Trent Nelson <trent@trent.me>
date:        Tue Oct 16 11:04:04 2012 -0400
files:       configure configure.ac
description:
Issue #15819: tweak logic in previous commit (617591e7d708).


diff -r 617591e7d708 -r 5707c8a36cc0 configure
--- a/configure	Tue Oct 16 08:41:32 2012 -0400
+++ b/configure	Tue Oct 16 11:04:04 2012 -0400
@@ -5210,7 +5210,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
diff -r 617591e7d708 -r 5707c8a36cc0 configure.ac
--- a/configure.ac	Tue Oct 16 08:41:32 2012 -0400
+++ b/configure.ac	Tue Oct 16 11:04:04 2012 -0400
@@ -833,7 +833,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