Rev 1695: Don't link explicitly against apr libraries. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1695
revision-id: jelmer at samba.org-20080901143251-cu9sfftxigkvfbfi
parent: jelmer at samba.org-20080901135109-30etl53iwe91foyb
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Mon 2008-09-01 16:32:51 +0200
message:
  Don't link explicitly against apr libraries.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  setup.py                       setup.py-20060502115218-86950492da22353f
=== modified file 'NEWS'
--- a/NEWS	2008-09-01 02:22:47 +0000
+++ b/NEWS	2008-09-01 14:32:51 +0000
@@ -29,6 +29,8 @@
    * Properly encode cache file path in case it contains non-ascii 
      characters. (#262923)
 
+   * Don't link explicitly against apr libraries. (#262711)
+
   FEATURES
 
    * Use native Windows password prompter on Windows. (#263287)

=== modified file 'setup.py'
--- a/setup.py	2008-08-27 09:57:53 +0000
+++ b/setup.py	2008-09-01 14:32:51 +0000
@@ -86,8 +86,7 @@
     includedir = apr_config("--includedir")
     if not os.path.isdir(includedir):
         raise Exception("APR development headers not found")
-    ldflags = filter(lambda x: x != "", apr_config("--link-ld").split(" "))
-    return (includedir, ldflags)
+    return (includedir,)
 
 
 def svn_build_data():
@@ -114,7 +113,7 @@
     # just clobber the functions above we can't use
     # for simplicitly, everything is done in the 'svn' one
     def apr_build_data():
-        return '.', ''
+        return '.', 
 
     def svn_build_data():
         # environment vars for the directories we need.
@@ -164,13 +163,12 @@
 
         return includes, lib_dirs, libs,
 
-(apr_includedir, apr_ldflags) = apr_build_data()
+(apr_includedir, ) = apr_build_data()
 (svn_includedirs, svn_libdirs, extra_libs) = svn_build_data()
 
 def SvnExtension(name, *args, **kwargs):
     kwargs["include_dirs"] = [apr_includedir] + svn_includedirs
     kwargs["library_dirs"] = svn_libdirs
-    kwargs["extra_link_args"] = apr_ldflags
     if os.name == 'nt':
         # on windows, just ignore and overwrite the libraries!
         kwargs["libraries"] = extra_libs