Make python-config support multiple option flags on the same command line,…

Make python-config support multiple option flags on the same command line, rather than requiring one invocation per flag.

Misc/NEWS

@@ -82,6 +82,8 @@ Tools/Demos
   measures the number of UDP packets processed per second depending on the
   number of background CPU-bound Python threads.
 
+- python-config now supports multiple options on the same command line.
+
 Build
 -----
 

Misc/python-config.in

@@ -21,33 +21,36 @@ except getopt.error:
 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]
+
+if '--help' in opt_flags:
+    exit_with_usage(code=0)
 
-elif opt == '--prefix':
+for opt in opt_flags:
+    if opt == '--prefix':
         print sysconfig.PREFIX
 
-elif opt == '--exec-prefix':
+    elif opt == '--exec-prefix':
         print sysconfig.EXEC_PREFIX
 
-elif opt in ('--includes', '--cflags'):
+    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'):
+    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'):
+        if opt == '--ldflags':
+            if not getvar('Py_ENABLE_SHARED'):
                 libs.insert(0, '-L' + getvar('LIBPL'))
+            libs.extend(getvar('LINKFORSHARED').split())
         print ' '.join(libs)