[Python-checkins] cpython (merge default -> default): Merge with remote.

Sun Apr 15 08:29:47 CEST 2012

http://hg.python.org/cpython/rev/72902ab938e0
changeset: 76316:72902ab938e0
parent: 76314:c7bf93802f5d
parent: 76315:7fce7409b347
user: Ross Lagerwall <rosslagerwall at gmail.com>
date: Sun Apr 15 08:23:09 2012 +0200
summary:
 Merge with remote.
files:
 setup.py | 9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -1072,6 +1072,7 @@
 else:
 missing.append('_sqlite3')
 
+ dbm_setup_debug = False # verbose debug prints from this script?
 dbm_order = ['gdbm']
 # The standard Unix dbm module:
 if platform not in ['cygwin']:
@@ -1093,7 +1094,7 @@
 ndbm_libs = ['ndbm']
 else:
 ndbm_libs = []
- print("building dbm using ndbm")
+ if dbm_setup_debug: print("building dbm using ndbm")
 dbmext = Extension('_dbm', ['_dbmmodule.c'],
 define_macros=[
 ('HAVE_NDBM_H',None),
@@ -1108,7 +1109,7 @@
 'gdbm_compat'):
 gdbm_libs.append('gdbm_compat')
 if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
- print("building dbm using gdbm")
+ if dbm_setup_debug: print("building dbm using gdbm")
 dbmext = Extension(
 '_dbm', ['_dbmmodule.c'],
 define_macros=[
@@ -1117,7 +1118,7 @@
 libraries = gdbm_libs)
 break
 if find_file("gdbm-ndbm.h", inc_dirs, []) is not None:
- print("building dbm using gdbm")
+ if dbm_setup_debug: print("building dbm using gdbm")
 dbmext = Extension(
 '_dbm', ['_dbmmodule.c'],
 define_macros=[
@@ -1127,7 +1128,7 @@
 break
 elif cand == "bdb":
 if db_incs is not None:
- print("building dbm using bdb")
+ if dbm_setup_debug: print("building dbm using bdb")
 dbmext = Extension('_dbm', ['_dbmmodule.c'],
 library_dirs=dblib_dir,
 runtime_library_dirs=dblib_dir,
-- 
Repository URL: http://hg.python.org/cpython
