[distutils-rework] Merged revisions 2922,2924-3484 via svnmerge from

http://svn.scipy.org/svn/numpy/trunk/numpy/distutils

Biggest problem in merging was appropiately choosing a f90 compiler in
build_clib and build_ext.

........
  r2979 | cookedm | 2006-08-08 17:16:05 -0400 (Tue, 08 Aug 2006) | 1 line
  
  fix #234: IntelVisualFCompiler is broken
........
  r3014 | stefan | 2006-08-14 06:05:22 -0400 (Mon, 14 Aug 2006) | 2 lines
  
  Ignore *.pyc files [for Albert Strasheim].
........
  r3061 | oliphant | 2006-08-24 16:07:59 -0400 (Thu, 24 Aug 2006) | 1 line
  
  update g95 version pattern
........
  r3138 | rkern | 2006-09-08 12:56:50 -0400 (Fri, 08 Sep 2006) | 1 line
  
  Fix #198
........
  r3164 | oliphant | 2006-09-15 17:06:47 -0400 (Fri, 15 Sep 2006) | 1 line
  
  Fix subversion number getting for 1.4 clients.  Also works for pre 1.4 clients.
........
  r3165 | oliphant | 2006-09-15 17:13:09 -0400 (Fri, 15 Sep 2006) | 1 line
  
  Fix when svnversion is not present.
........
  r3166 | oliphant | 2006-09-15 17:18:33 -0400 (Fri, 15 Sep 2006) | 1 line
  
  Small code re-org in _get_svn_revision
........
  r3228 | cookedm | 2006-09-28 07:23:18 -0400 (Thu, 28 Sep 2006) | 1 line
  
  For the MKL library, define the macro SCIPY_MKL_H
........
  r3240 | rkern | 2006-10-02 12:41:47 -0400 (Mon, 02 Oct 2006) | 1 line
  
  Add .dylib as a valid OS X shared library extension.
........
  r3290 | pearu | 2006-10-08 05:30:17 -0400 (Sun, 08 Oct 2006) | 1 line
  
  numpy.distutils: use language flag or source file extension to select default f77 or f90 compiler.
........
  r3291 | pearu | 2006-10-08 05:38:12 -0400 (Sun, 08 Oct 2006) | 1 line
  
  numpy.distutils: fixed bug.
........
  r3302 | pearu | 2006-10-10 16:27:23 -0400 (Tue, 10 Oct 2006) | 1 line
  
  Improved is_free_format.
........
  r3371 | pearu | 2006-10-19 18:03:23 -0400 (Thu, 19 Oct 2006) | 1 line
  
  Add Intel Itanium compiler 9.x support (needs testing).
........
  r3372 | oliphant | 2006-10-19 18:55:23 -0400 (Thu, 19 Oct 2006) | 1 line
  
  Fix missing comment characters in intel.py.  Check for None in .reshape and .resize
........
  r3430 | stefan | 2006-11-04 16:19:03 -0500 (Sat, 04 Nov 2006) | 2 lines
  
  Fix typo.
........
  r3450 | pearu | 2006-11-19 15:56:57 -0500 (Sun, 19 Nov 2006) | 1 line
  
  Skip interactive mode when using script_args argument.
........
  r3467 | oliphant | 2006-12-01 23:34:25 -0500 (Fri, 01 Dec 2006) | 1 line
  
  Try updating version command for NAG compiler.
........

1 files changed, 4 insertions, 3 deletions

diff --git a/command/build_src.py b/command/build_src.py
index 19401a44c..12d19402e 100644
--- a/command/build_src.py
+++ b/command/build_src.py
@@ -438,7 +438,8 @@ class build_src(build_ext.build_ext):
             if (self.force or newer_group(depends, target_file,'newer')) \
                    and not skip_f2py:
                 log.info("f2py: %s" % (source))
-                f2py.run_main(f2py_options + ['--build-dir',target_dir,source])
+                numpy.f2py.run_main(f2py_options
+                                    + ['--build-dir',target_dir,source])
             else:
                 log.debug("  skipping '%s' f2py interface (up-to-date)" % (source))
         else:
@@ -455,7 +456,7 @@ class build_src(build_ext.build_ext):
                    and not skip_f2py:
                 log.info("f2py:> %s" % (target_file))
                 self.mkpath(target_dir)
-                f2py.run_main(f2py_options + ['--lower',
+                numpy.f2py.run_main(f2py_options + ['--lower',
                                                 '--build-dir',target_dir]+\
                                 ['-m',ext_name]+f_sources)
             else:
@@ -475,7 +476,7 @@ class build_src(build_ext.build_ext):
             extension.include_dirs.append(self.build_src)
 
         if not skip_f2py:
-            d = os.path.dirname(f2py.__file__)
+            d = os.path.dirname(numpy.f2py.__file__)
             source_c = os.path.join(d,'src','fortranobject.c')
             source_h = os.path.join(d,'src','fortranobject.h')
             if newer(source_c,target_c) or newer(source_h,target_h):