Merged revisions 79082,79084 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79082 | collin.winter | 2010-03-18 17:00:30 -0700 (Thu, 18 Mar 2010) | 1 line
Add a separate python-config make target, useful for testing changes to Misc/python-config.in.
........
r79084 | collin.winter | 2010-03-18 17:08:44 -0700 (Thu, 18 Mar 2010) | 1 line
Make python-config support multiple option flags on the same command line, rather than requiring one invocation per flag.
........
diff --git a/Misc/python-config.in b/Misc/python-config.in
index 47ea669..c03b4fa 100644
--- a/Misc/python-config.in
+++ b/Misc/python-config.in
@@ -21,33 +21,36 @@
if not opts:
exit_with_usage()
-opt = opts[0][0]
-
pyver = sysconfig.get_config_var('VERSION')
getvar = sysconfig.get_config_var
-if opt == '--help':
- exit_with_usage(0)
+opt_flags = [flag for (flag, val) in opts]
-elif opt == '--prefix':
- print(sysconfig.PREFIX)
+if '--help' in opt_flags:
+ exit_with_usage(code=0)
-elif opt == '--exec-prefix':
- print(sysconfig.EXEC_PREFIX)
+for opt in opt_flags:
+ if opt == '--prefix':
+ print(sysconfig.PREFIX)
-elif opt in ('--includes', '--cflags'):
- flags = ['-I' + sysconfig.get_python_inc(),
- '-I' + sysconfig.get_python_inc(plat_specific=True)]
- if opt == '--cflags':
- flags.extend(getvar('CFLAGS').split())
- print(' '.join(flags))
+ elif opt == '--exec-prefix':
+ print(sysconfig.EXEC_PREFIX)
-elif opt in ('--libs', '--ldflags'):
- libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
- libs.append('-lpython'+pyver)
- # add the prefix/lib/pythonX.Y/config dir, but only if there is no
- # shared library in prefix/lib/.
- if opt == '--ldflags' and not getvar('Py_ENABLE_SHARED'):
- libs.insert(0, '-L' + getvar('LIBPL'))
- print(' '.join(libs))
+ elif opt in ('--includes', '--cflags'):
+ flags = ['-I' + sysconfig.get_python_inc(),
+ '-I' + sysconfig.get_python_inc(plat_specific=True)]
+ if opt == '--cflags':
+ flags.extend(getvar('CFLAGS').split())
+ print(' '.join(flags))
+
+ elif opt in ('--libs', '--ldflags'):
+ libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
+ libs.append('-lpython'+pyver)
+ # add the prefix/lib/pythonX.Y/config dir, but only if there is no
+ # shared library in prefix/lib/.
+ if opt == '--ldflags':
+ if not getvar('Py_ENABLE_SHARED'):
+ libs.insert(0, '-L' + getvar('LIBPL'))
+ libs.extend(getvar('LINKFORSHARED').split())
+ print(' '.join(libs))