Commits

Anonymous committed eac3b67 Merge

Merge branch 'master' of https://code.google.com/p/waf

Comments (0)

Files changed (2)

 * Codelite plugin by Christian Klein
 * Validate the versioned library number #1180
 * New export_defines keyword for C/C++/Fortran libraries
+* Python config tests enhancements #1231
 
 NEW IN WAF 1.7.9
 ----------------

waflib/Tools/python.py

 	except conf.errors.ConfigurationError:
 		# python3.2, oh yeah
 		xx = conf.env.CXX_NAME and 'cxx' or 'c'
-		conf.check_cfg(msg='Asking python-config for the flags (pyembed)',
-			path=conf.env.PYTHON_CONFIG, package='', uselib_store='PYEMBED', args=['--cflags', '--libs', '--ldflags'])
+
+		flags = ['--cflags', '--libs', '--ldflags']
+
+		for f in flags:
+			conf.check_cfg(msg='Asking python-config for pyembed %s flags' % f,
+				path=conf.env.PYTHON_CONFIG, package='', uselib_store='PYEMBED', args=[f])
 		conf.check(header_name='Python.h', define_name='HAVE_PYTHON_H', msg='Getting pyembed flags from python-config',
 			fragment=FRAG, errmsg='Could not build a python embedded interpreter',
 			features='%s %sprogram pyembed' % (xx, xx))
-		conf.check_cfg(msg='Asking python-config for the flags (pyext)',
-			path=conf.env.PYTHON_CONFIG, package='', uselib_store='PYEXT', args=['--cflags', '--libs', '--ldflags'])
+
+		for f in flags:
+			conf.check_cfg(msg='Asking python-config for pyext %s flags' % f,
+				path=conf.env.PYTHON_CONFIG, package='', uselib_store='PYEXT', args=[f])
 		conf.check(header_name='Python.h', define_name='HAVE_PYTHON_H', msg='Getting pyext flags from python-config',
 			features='%s %sshlib pyext' % (xx, xx), fragment=FRAG, errmsg='Could not build python extensions')
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.