changeset:   79760:85863c4a93db
branch:      3.3
parent:      79753:1280b38fe583
parent:      79759:5707c8a36cc0
user:        Trent Nelson <trent@trent.me>
date:        Tue Oct 16 11:07:31 2012 -0400
files:       configure configure.ac
description:
Merge issue #15819: tweak logic in previous commit.


diff -r 1280b38fe583 -r 85863c4a93db configure
--- a/configure	Tue Oct 16 23:14:03 2012 +1000
+++ b/configure	Tue Oct 16 11:07:31 2012 -0400
@@ -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
diff -r 1280b38fe583 -r 85863c4a93db configure.ac
--- a/configure.ac	Tue Oct 16 23:14:03 2012 +1000
+++ b/configure.ac	Tue Oct 16 11:07:31 2012 -0400
@@ -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