[minion-cvs] Improve handling of OPENSSL_SRC

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	setup.py 
Log Message:
Improve handling of OPENSSL_SRC

Index: setup.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/setup.py,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- setup.py	5 Sep 2003 21:59:49 -0000	1.78
+++ setup.py	13 Oct 2003 17:25:06 -0000	1.79
@@ -115,12 +115,12 @@
       make build-openssl
 
       (then)
-      make build
+      make
 
       (Or, if you have the OpenSSL source somewhere else, use OPENSSL_SRC
       as in:
                make build-openssl OPENSSL_SRC=~/src/openssl-0.9.7
-               make build         OPENSSL_SRC=~/src/openssl-0.9.7
+               make               OPENSSL_SRC=~/src/openssl-0.9.7
       )
 ======================================================================"""
 
@@ -159,9 +159,14 @@
         STATIC_LIBS = []
         LIBRARY_DIRS = []
         LIBRARIES = [ 'ssl', 'crypto' ]
-    elif (os.path.exists(os.environ.get("OPENSSL_SRC", "./contrib/openssl"))
+    elif ((os.path.exists("./contrib/openssl") or
+           os.environ.get("OPENSSL_SRC"))
           and not os.environ.get("OPENSSL_PREFIX")):
         openssl_src = os.environ.get("OPENSSL_SRC", "./contrib/openssl")
+        openssl_src = os.path.expanduser(openssl_src)
+        if not os.path.exists(openssl_src):
+            print "$OPENSSL_SRC does not exist."
+            sys.exit(1)
         print "Using OpenSSL from", openssl_src
         openssl_inc = os.path.join(openssl_src, "include")
         INCLUDE_DIRS = [openssl_inc]