changeset: 77482:1f6c23ed8218
parent: 77480:afe67ea94bc6
parent: 77481:e2be1f43beed
user: Nick Coghlan <ncoghlan@gmail.com>
date: Sun Jun 17 18:27:54 2012 +1000
files: setup.py
description:
Merge from 3.2. (Issue #15044: Handle Fedora 17's approach to ndbm compatibility)
diff -r afe67ea94bc6 -r 1f6c23ed8218 setup.py
--- a/setup.py	Sun Jun 17 03:53:47 2012 -0400
+++ b/setup.py	Sun Jun 17 18:27:54 2012 +1000
@@ -1085,10 +1085,14 @@
 for cand in dbm_order:
 if cand == "ndbm":
 if find_file("ndbm.h", inc_dirs, []) is not None:
- # Some systems have -lndbm, others don't
+ # Some systems have -lndbm, others have -lgdbm_compat,
+ # others don't have either
 if self.compiler.find_library_file(lib_dirs,
 'ndbm'):
 ndbm_libs = ['ndbm']
+ elif self.compiler.find_library_file(lib_dirs,
+ 'gdbm_compat'):
+ ndbm_libs = ['gdbm_compat']
 else:
 ndbm_libs = []
 if dbm_setup_debug: print("building dbm using ndbm")
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/1f6c23ed8218">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/1f6c23ed8218" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>