[Zodb-checkins] CVS: ZODB3 - setup.py:1.20.2.8

[Barry Warsaw]

Update of /cvs-repository/ZODB3
In directory cvs.zope.org:/tmp/cvs-serv23446

Modified Files:
      Tag: ZODB3-3_1-branch
	setup.py 
Log Message:
Sync this with the trunk for BDBStorage.


=== ZODB3/setup.py 1.20.2.7 => 1.20.2.8 ===
--- ZODB3/setup.py:1.20.2.7	Tue Jan  7 12:44:03 2003
+++ ZODB3/setup.py	Tue Jan  7 14:34:34 2003
@@ -119,20 +119,8 @@
 
 package_dir = {}
 
-# XXX This doesn't work for source distributions; we need a better way
-# to spell things like this in distutils.  Like this, the
-# bsddb3Storage package isn't included in the source distribution.
-# Either this test only makes sense for inclusion in binary releases,
-# or these packages should always be included and client code should
-# test for bsddb3 before expecting this to work; they'll get an
-# ImportError if it's not there.
-#
-try:
-    import bsddb3
-except ImportError:
-    pass
-else:
-    packages.extend(["BDBStorage", "BDBStorage.tests"])
+packages.extend(["BDBStorage", "BDBStorage.tests"])
+package_dir['BDBStorage'] = 'BDBStorage'
 
 # This version of ZODB ships with two incompatible versions of ZEO.
 # The recommended version is ZEO 2.0, which is the focus of current
@@ -169,10 +157,8 @@
                ]
 
 # Don't build the helper unless using at least Python 2.2
-# XXX Commented out because it doesn't work without BSDDB installed.
-#     Having this work is more important than having BSDDB work.
-##if sys.hexversion >= 0x020200F0:
-##    ext_modules.append(bsddbhelper)
+if sys.hexversion >= 0x020200F0:
+    ext_modules.append(bsddbhelper)
 
 doclines = __doc__.split("\n")