Issue #15819: tweak logic in previous commit (617591e7d708).

66031181 · Trent Nelson · 9effe699 · 66031181 · 66031181
Commit 66031181 authored Oct 16, 2012 by Trent Nelson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

configure configure +1 -1

configure.ac configure.ac +1 -1

No files found.
--- 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

--- 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