Merge branch 'vail130-master'

mehcode · mehcode · commit 91c7331cfa22 · 2014-12-12T11:31:56.000-08:00
diff --git a/README.md b/README.md
@@ -8,13 +8,32 @@ Check the [examples](https://github.com/concordusapps/python-xmlsec/tree/master/
 
 ## Install
 
+### Pre-Install
+
+#### Linux
+
+   ```sh
+   apt-get install libxml2-dev libxmlsec1-dev
+   ```
+
+#### Mac
+
+   ```sh
+   brew install libxml2 libxmlsec1
+   ```
+
 ### Automated
 
 1. **xmlsec** can be installed through `easy_install` or `pip`.
 
    ```sh
    pip install xmlsec
    ```
+   
+#### Mac
+
+If you get any fatal errors about missing .h files, update your C_INCLUDE_PATH environment variable to
+include the appropriate files from the libxml2 and libxmlsec1 libraries.
 
 ### Manual
 
diff --git a/setup.py b/setup.py
@@ -83,10 +83,15 @@ def make_extension(name, cython=True):
     for lib in ['libxml-2.0', 'xmlsec1-%s' % XMLSEC_CRYPTO]:
         config.update(parse(lib))
 
+    config['extra_compile_args'] = ['-DXMLSEC_CRYPTO_OPENSSL=1']
+
     # List-ify config for setuptools.
     for key in config:
         config[key] = list(config[key])
 
+    if 'include_dirs' not in config:
+        config['include_dirs'] = []
+
     # Add the source directories for inclusion.
     config['include_dirs'].insert(0, 'src')
 
