| configure: fix pkg_config usage |
| |
| Cross compilation did pick up wrong libraries as it was using the system |
| pkg-config. |
| |
| --- configure 2014-11-27 12:15:28.539395021 +0100 |
| +++ configure 2014-11-27 15:29:13.677461159 +0100 |
| @@ -299,12 +299,13 @@ |
| |
| |
| def pkg_config(pkg): |
| - cmd = os.popen('pkg-config --libs %s' % pkg, 'r') |
| + pkg_config = os.environ['PKG_CONFIG'] |
| + cmd = os.popen(pkg_config + ' --libs %s' % pkg, 'r') |
| libs = cmd.readline().strip() |
| ret = cmd.close() |
| if (ret): return None |
| |
| - cmd = os.popen('pkg-config --cflags %s' % pkg, 'r') |
| + cmd = os.popen(pkg_config + ' --cflags %s' % pkg, 'r') |
| cflags = cmd.readline().strip() |
| ret = cmd.close() |
| if (ret): return None |
| @@ -548,15 +549,21 @@ |
| def configure_libz(o): |
| o['variables']['node_shared_zlib'] = b(options.shared_zlib) |
| |
| - # assume shared_zlib if one of these is set? |
| - if options.shared_zlib_libpath: |
| - o['libraries'] += ['-L%s' % options.shared_zlib_libpath] |
| - if options.shared_zlib_libname: |
| - o['libraries'] += ['-l%s' % options.shared_zlib_libname] |
| - elif options.shared_zlib: |
| - o['libraries'] += ['-lz'] |
| - if options.shared_zlib_includes: |
| - o['include_dirs'] += [options.shared_zlib_includes] |
| + if options.shared_zlib: |
| + (libs, cflags) = pkg_config('zlib') or ('-lz', '') |
| + |
| + if options.shared_zlib_libpath: |
| + o['libraries'] += ['-L%s' % options.shared_zlib_libpath] |
| + |
| + if options.shared_zlib_libname: |
| + o['libraries'] += ['-l%s' % options.shared_zlib_libname] |
| + else: |
| + o['libraries'] += libs.split() |
| + |
| + if options.shared_zlib_includes: |
| + o['include_dirs'] += [options.shared_zlib_includes] |
| + else: |
| + o['cflags'] += cflags.split() |
| |
| |
| def configure_http_parser(o): |
