[Python-checkins] python/dist/src setup.py,1.165,1.166

loewis@users.sourceforge.net loewis@users.sourceforge.net
Fri, 09 May 2003 02:05:22 -0700


Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv13648

Modified Files:
	setup.py 
Log Message:
Only look for krb5.h if ssl.h was found. 
Fixes bug reported in comment to #728322.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -d -r1.165 -r1.166
*** setup.py	7 May 2003 15:38:47 -0000	1.165
--- setup.py	9 May 2003 09:05:19 -0000	1.166
***************
*** 448,455 ****
                               ]
                               )
!         krb5_h = find_file('krb5.h', inc_dirs,
!                            ['/usr/kerberos/include'])
!         if krb5_h:
!             ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
                                       ['/usr/local/ssl/lib',
--- 448,456 ----
                               ]
                               )
!         if ssl_incs is not None:
!             krb5_h = find_file('krb5.h', inc_dirs,
!                                ['/usr/kerberos/include'])
!             if krb5_h:
!                 ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
                                       ['/usr/local/ssl/lib',