diff options
| author | Trent Nelson <trent@trent.me> | 2012-10-16 15:09:31 (GMT) |
|---|---|---|
| committer | Trent Nelson <trent@trent.me> | 2012-10-16 15:09:31 (GMT) |
| commit | 65c60851b088a1d7e9b0d9638a18d43b7702c799 (patch) | |
| tree | 8bfc8c9994aa7b2cdc654f8260b464c4e4b91e86 | |
| parent | 68e9d7c1020ff67eaa269f3946b40ed2914e680b (diff) | |
| parent | 56d4c03cb2971701db716f80a4d8bd5febce429a (diff) | |
| download | cpython-65c60851b088a1d7e9b0d9638a18d43b7702c799.zip cpython-65c60851b088a1d7e9b0d9638a18d43b7702c799.tar.gz cpython-65c60851b088a1d7e9b0d9638a18d43b7702c799.tar.bz2 | |
Merge issue #15819: tweak logic in previous commit.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -2724,7 +2724,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu 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 1762bd6..bcf0387 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) 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 |