Rev 1559: Merge patch to support environment variables for svn files. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1559
revision-id: jelmer at samba.org-20080806144640-bn57kkwcgjwzojil
parent: jelmer at samba.org-20080806135820-exp2fhd14wxrn7bv
parent: mhaecker at cs.tu-berlin.de-20080806132101-yxggt13dradgf1i3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Wed 2008-08-06 16:46:40 +0200
message:
  Merge patch to support environment variables for svn files.
modified:
  setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1557.1.1
    revision-id: mhaecker at cs.tu-berlin.de-20080806132101-yxggt13dradgf1i3
    parent: jelmer at samba.org-20080806025147-0m02ta5f1omi36fh
    committer: Martin Haecker <mhaecker at cs.tu-berlin.de>
    branch nick: support-environment-variables-to-set-svn-libs-and-header-dir-directly
    timestamp: Wed 2008-08-06 15:21:01 +0200
    message:
      Added Support for SVN_HEADER_PATH and SVN_LIBRARY_PATH to set them directly
    modified:
      setup.py                       setup.py-20060502115218-86950492da22353f
=== modified file 'setup.py'
--- a/setup.py	2008-08-02 15:20:48 +0000
+++ b/setup.py	2008-08-06 13:21:01 +0000
@@ -86,6 +86,8 @@
 
 def svn_build_data():
     """Determine the Subversion header file location."""
+    if "SVN_HEADER_PATH" in os.environ and "SVN_LIBRARY_PATH" in os.environ:
+        return ([os.getenv("SVN_HEADER_PATH")], [os.getenv("SVN_LIBRARY_PATH")], [])
     svn_prefix = os.getenv("SVN_PREFIX")
     if svn_prefix is None:
         basedirs = ["/usr/local", "/usr"]
@@ -98,7 +100,7 @@
         return ([os.path.join(svn_prefix, "include/subversion-1")], 
                 [os.path.join(svn_prefix, "lib")], [])
     raise Exception("Subversion development files not found. "
-                    "Please set SVN_PREFIX environment variable. ")
+                    "Please set SVN_PREFIX or (SVN_LIBRARY_PATH and SVN_HEADER_PATH) environment variable. ")
 
 # Windows versions - we use environment variables to locate the directories
 # and hard-code a list of libraries.