svn commit: r169522 - /httpd/mod_python/trunk/dist/setup.py.in

[nl...@apache.org]

Author: nlehuen
Date: Tue May 10 13:58:26 2005
New Revision: 169522

URL: http://svn.apache.org/viewcvs?rev=169522&view=rev
Log:
Integrated Jim Gallacher's fixes for setup.py.in : better support for Unix builds.

Modified:
    httpd/mod_python/trunk/dist/setup.py.in

Modified: httpd/mod_python/trunk/dist/setup.py.in
URL: http://svn.apache.org/viewcvs/httpd/mod_python/trunk/dist/setup.py.in?rev=169522&r1=169521&r2=169522&view=diff
==============================================================================
--- httpd/mod_python/trunk/dist/setup.py.in (original)
+++ httpd/mod_python/trunk/dist/setup.py.in Tue May 10 13:58:26 2005
@@ -39,12 +39,12 @@
     if not os.path.exists(config_status_file):
         raise AssertionError("config.status not found in expected location (%s)" % config_status_file)
     header = open(config_status_file, 'r')
-    r = re.compile('s, @%s@, (?P<OPTION_STRING>[^,]+), ' % (option_name))
+    r = re.compile(r's,\s*@%s@,\s*(?P<OPTION_STRING>[^,]+),\s*' % (option_name))
     for line in header.readlines():
         m = r.search(line)
         if m is not None:
             return m.group('OPTION_STRING')
-        raise AssertionError("unable to find @%s@ definition in %s", (option_name, config_status_file))
+    raise AssertionError("unable to find @%s@ definition in %s", (option_name, config_status_file))
 
 def getmp_version():
     """finds out the version of mod_python"""
@@ -120,10 +120,15 @@
 class ModPyExtension(Extension):
     """a class that actually builds the mod_python.so extension for Apache (yikes)"""
     def __init__(self, source_dir, include_dirs, library_dirs):
+        if winbuild:
+            libraries = ['libhttpd', 'libapr', 'libaprutil', 'ws2_32']
+        else:
+            libraries = ['apr-0', 'aprutil-0']
+
         Extension.__init__(self, "mod_python_so",
             sources = [os.path.join(source_dir, source_file) for source_file in modpy_src_files],
                            include_dirs=include_dirs,
-            libraries = ['libhttpd', 'libapr', 'libaprutil', 'ws2_32'],
+            libraries = libraries,
             library_dirs=library_dirs
                            )
         if winbuild: