Rev 1753: Merge 0.4.12. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1753
revision-id: jelmer at samba.org-20080901150642-gc8skyu7quyzhkg9
parent: jelmer at samba.org-20080901135306-2bimnauyzyr11avm
parent: jelmer at samba.org-20080901145741-ffxw9t868r8yb6oa
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-09-01 17:06:42 +0200
message:
  Merge 0.4.12.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  setup.py                       setup.py-20060502115218-86950492da22353f
    ------------------------------------------------------------
    revno: 1669.1.27
    tags: bzr-svn-0.4.12
    revision-id: jelmer at samba.org-20080901145741-ffxw9t868r8yb6oa
    parent: jelmer at samba.org-20080901143251-cu9sfftxigkvfbfi
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Mon 2008-09-01 16:57:41 +0200
    message:
      Release 0.4.12.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
    ------------------------------------------------------------
    revno: 1669.1.26
    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:23:15 +0000
+++ b/NEWS	2008-09-01 15:06:42 +0000
@@ -33,7 +33,7 @@
 
     + Standard commit code provides commit notification. (#79333)
 
-bzr-svn 0.4.12	UNRELEASED
+bzr-svn 0.4.12	2008-09-01
 
   BUG FIXES
 
@@ -64,6 +64,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-28 14:41:24 +0000
+++ b/setup.py	2008-09-01 15:06:42 +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