Don't build with Python support by default anymore

1 files changed, 7 insertions, 2 deletions

diff --git a/acprep b/acprep
index 1eb20bee..cbbe360e 100755
--- a/acprep
+++ b/acprep
@@ -209,7 +209,7 @@ class BoostInfo(object):
 
     def dependencies(self, system):
         if system == 'darwin':
-            return [ 'boost-jam', 'boost', '+icu+python27+st+universal' ]
+            return [ 'boost-jam', 'boost', '+python27+universal' ]
 
         if system == 'centos':
             return [ 'boost-devel' ]
@@ -398,7 +398,7 @@ class PrepareBuild(CommandLineApp):
         self.products_dir      = None
         self.build_dir         = self.source_dir
         self.make_command      = None
-        self.configure_args    = ['--with-included-gettext', '--enable-python']
+        self.configure_args    = ['--with-included-gettext']
         self.boost_info        = BoostInfo(self.log)
         self.sys_include_dirs  = []
         self.sys_library_dirs  = []
@@ -502,6 +502,9 @@ class PrepareBuild(CommandLineApp):
         op.add_option('', '--no-git', action='store_true', dest='no_git',
                       default=False,
                       help='Do not call out to Git; useful for offline builds')
+        op.add_option('', '--python', action='store_true', dest='python',
+                      default=False,
+                      help='Enable Python support (if disabled in acprep)')
         op.add_option('', '--no-python', action='store_true', dest='no_python',
                       default=False,
                       help='Do not enable Python support by default')
@@ -552,6 +555,8 @@ class PrepareBuild(CommandLineApp):
                       help='Enable full warning flags')
 
     def main(self, *args):
+        if self.options.python:
+            self.configure_args.append('--enable-python')
         if self.options.no_python:
             self.configure_args.remove('--enable-python')