Merge branch 'feature/multi-version-import' of https://github.com/abadger/ansible into abadger-feature/multi-version-import

1 files changed, 12 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index c537ee9766..166f754ac5 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,17 @@ from glob import glob
 
 sys.path.insert(0, os.path.abspath('lib'))
 from ansible import __version__, __author__
-from distutils.core import setup
+try:
+    from setuptools import setup
+    raise ImportError
+except ImportError:
+    print('''
+ansible now needs setuptools in order to build.
+
+Some scripts now need setuptools installed in order to run.
+          ''')
+    raise
+
 
 # find library modules
 from ansible.constants import DEFAULT_MODULE_PATH
@@ -29,7 +39,7 @@ setup(name='ansible',
       author_email='michael@ansible.com',
       url='http://ansible.com/',
       license='GPLv3',
-      install_requires=['paramiko', 'jinja2', "PyYAML"],
+      install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6'],
       package_dir={ 'ansible': 'lib/ansible' },
       packages=[
          'ansible',