Changeset 391 for python/trunk/Misc/python-config.in

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Misc/python-config.in (modified) (2 diffs)

python/trunk/Misc/python-config.in

@@ -6 +6 @@
 from distutils import sysconfig
 
-valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags', 
+valid_opts = ['prefix', 'exec-prefix', 'includes', 'libs', 'cflags',
               'ldflags', 'help']
 
 def exit_with_usage(code=1):
-    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0], 
+    print >>sys.stderr, "Usage: %s [%s]" % (sys.argv[0],
                                             '|'.join('--'+opt for opt in valid_opts))
     sys.exit(code)
@@ -22 +22 @@
     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'):
-    if os.name != 'os2':
-        libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
-    else
+    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'):
         # YD ignore libs
-        libs = 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)
+        if os.name != 'os2':
+            libs = getvar('LIBS').split() + getvar('SYSLIBS').split()
+        else:
+            libs = 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'))
+            if not getvar('PYTHONFRAMEWORK'):
+                libs.extend(getvar('LINKFORSHARED').split())
+        print ' '.join(libs)