[Python-checkins] CVS: python/dist/src setup.py,1.35,1.36

[A.M. Kuchling]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv4770

Modified Files:
	setup.py 
Log Message:
Tidy up the ordering of include and library directories, putting 
    /usr/local first and leaving /usr/include at the end.  This addresses
    the comments in bug #232609.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** setup.py	2001/03/02 06:24:14	1.35
--- setup.py	2001/03/17 16:56:35	1.36
***************
*** 147,153 ****
          # Ensure that /usr/local is always used
          if '/usr/local/lib' not in self.compiler.library_dirs:
!             self.compiler.library_dirs.append('/usr/local/lib')
          if '/usr/local/include' not in self.compiler.include_dirs:
!             self.compiler.include_dirs.append( '/usr/local/include' )
  
          # lib_dirs and inc_dirs are used to search for files;
--- 147,153 ----
          # Ensure that /usr/local is always used
          if '/usr/local/lib' not in self.compiler.library_dirs:
!             self.compiler.library_dirs.insert(0, '/usr/local/lib')
          if '/usr/local/include' not in self.compiler.include_dirs:
!             self.compiler.include_dirs.insert(0, '/usr/local/include' )
  
          # lib_dirs and inc_dirs are used to search for files;
***************
*** 155,163 ****
          # be assumed that no additional -I,-L directives are needed.
          lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
!         inc_dirs = ['/usr/include'] + self.compiler.include_dirs
          exts = []
  
          platform = self.get_platform()
! 
          # Check for MacOS X, which doesn't need libm.a at all
          math_libs = ['m']
--- 155,163 ----
          # be assumed that no additional -I,-L directives are needed.
          lib_dirs = self.compiler.library_dirs + ['/lib', '/usr/lib']
!         inc_dirs = self.compiler.include_dirs + ['/usr/include'] 
          exts = []
  
          platform = self.get_platform()
!         
          # Check for MacOS X, which doesn't need libm.a at all
          math_libs = ['m']