pysvn (1.7.2-3) Source/setup_configure.py

--- pysvn-1.7.2.orig/Source/setup_configure.py
+++ pysvn-1.7.2/Source/setup_configure.py
@@ -231,6 +231,8 @@
         for flag in py_cflags_python_list:
             if flag.startswith( '-D' ):
                 py_cflags_list.append( flag )
+            if flag.startswith( '-O' ) or flag.startswith( '-f' ) or flag.startswith( '-g' ):
+                py_cflags_list.append( flag )
 
         # add platform specific defines
         if self.is_mac_os_x:
@@ -432,7 +434,7 @@
 LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
 -lsvn_client-1 \
 -lsvn_diff-1 \
--lsvn_repos-1 \
+-lsvn_repos-1 `apr-config --link-ld --libs` \
  -lcom_err -lresolv -lexpat -lneon
 
 #include pysvn_common.mak
@@ -451,7 +453,7 @@
 PYCXX=%(pycxx_dir)s
 PYCXXSRC=%(pycxx_src_dir)s
 LDSHARED=g++ -shared %(debug_cflags)s
-LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
+LDLIBS=-L%(svn_lib_dir)s \
 -lsvn_client-1 \
 -lsvn_diff-1 \
 -lsvn_repos-1 \
@@ -473,7 +475,7 @@
 PYCXX=%(pycxx_dir)s
 PYCXXSRC=%(pycxx_src_dir)s
 LDSHARED=g++ -shared %(debug_cflags)s
-LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
+LDLIBS=-L%(svn_lib_dir)s \
 -lsvn_client-1 \
 -lsvn_diff-1 \
 -lsvn_repos-1 \
@@ -750,11 +752,11 @@
                         '../Import/pycxx-%d.%d.%d' % pycxx_version,
                         distutils.sysconfig.get_python_inc() # typical Linux
                     ],
-                    'CXX/Version.hxx' )
+                    'cxxsupport.cxx' )
 
         major_match = False
         minor_match = False
-        f = open( os.path.join( pycxx_dir, 'CXX/Version.hxx' ) )
+        f = open( os.path.join( '/usr/include/python%s' % sys.version[:3], 'CXX/Version.hxx' ) )
         for line in f:
             words = line.split()
             if 'PYCXX_VERSION_MAJOR' in words:
@@ -765,6 +767,7 @@
         if not major_match and not minor_match:
             raise SetupError( 'PyCXX version not as required.' )
 
+        return '/usr/share/python%s' % sys.version[:3]
         return pycxx_dir
 
 
@@ -829,7 +832,7 @@
 
     def find_apr_inc( self ):
         last_exception = None
-        for apr_ver in ['apr-1', 'apr-0']:
+        for apr_ver in ['apr-1.0', 'apr-1', 'apr-0']:
             try:
                 return self.find_dir(
                     'APR include',