[minion-cvs] Maybe this will work better when openssl 0.9.7 is insta...

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion
In directory moria.mit.edu:/tmp/cvs-serv8243

Modified Files:
	setup.py 
Log Message:
Maybe this will work better when openssl 0.9.7 is installed

Index: setup.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/setup.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- setup.py	3 Feb 2003 22:00:50 -0000	1.39
+++ setup.py	5 Feb 2003 06:19:28 -0000	1.40
@@ -29,13 +29,18 @@
 if USE_OPENSSL:
     # For now, we assume that openssl-0.9.7 hasn't been released.  When this
     # changes, we can fix this rigamarole.
-    openssl_inc = os.environ.get("MM_OPENSSL_INCLUDE",
-                                 "./contrib/openssl/include")
-    INCLUDE_DIRS=[openssl_inc]
-    STATIC_LIBS=['./contrib/openssl/libssl.a', './contrib/openssl/libcrypto.a']
-##      openssl_lib = os.environ.get("MM_OPENSSL_LIB", "./contrib/openssl")
-##      LIB_DIRS=[openssl_lib]
-##      LIBRARIES=['ssl','crypto']
+    if os.path.exists("./contrib/openssl"):
+        print "Using OpenSSL from ./contrib/openssl"
+        openssl_inc = "./contrib/openssl/include"
+        INCLUDE_DIRS = [openssl_inc]
+        STATIC_LIBS=['./contrib/openssl/libssl.a',
+                     './contrib/openssl/libcrypto.a']
+        LIBRARIES=[]
+    else:
+        print "Using platform OpenSSL."
+        INCLUDE_DIRS=[]
+        STATIC_LIBS=[]
+        LIBRARIES=['ssl','crypto']
 
 MACROS=[]
 MODULES=[]
@@ -221,6 +226,7 @@
                       include_dirs=INCLUDE_DIRS,
                       extra_objects=STATIC_LIBS,
                       extra_compile_args=["-Wno-strict-prototypes" ],
+                      libraries=LIBRARIES,
                       define_macros=MACROS)
 
 setup(name='Mixminion',