diff options
| author | Stefan Bühler <stbuehler@web.de> | 2017-10-24 12:21:18 +0200 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2017-10-28 22:41:32 -0400 |
| commit | 96e198d6215af3434eeeb1e31c43a7188663e826 (patch) | |
| tree | 428be5b7973c65686203016fca996d49b168c9cf /SConstruct | |
| parent | 2506e21b08e271426b9b1959b36537ea4835b2ac (diff) | |
| download | lighttpd-git-96e198d6215af3434eeeb1e31c43a7188663e826.tar.gz | |
[scons] fix with_pgsql
pg_config --includedir --libdir doesn't print the "-I" or "-l" prefixes,
so ParseConfig can't parse it. Use pkg-config instead.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -385,14 +385,11 @@ if env['with_mysql']: env['LIBS'] = oldlib if env['with_pgsql']: - pg_config = checkProgram(env, 'pgsql', 'pg_config') oldlib = env['LIBS'] env['LIBS'] = [] - env.ParseConfig(pg_config + ' --includedir --libdir') + env.ParseConfig('pkg-config libpq --cflags --libs') env.Append(CPPFLAGS = [ '-DHAVE_PGSQL_H', '-DHAVE_LIBPGSQL' ], LIBPGSQL = 'pq') env['LIBS'] = oldlib - #if autoconf.CheckLibWithHeader('pq', 'libpq-fe.h', 'C'): - # env.Append(CPPFLAGS = [ '-DHAVE_PGSQL_H', '-DHAVE_LIBPGSQL' ], LIBPGSQL = 'pq') if env['with_dbi']: if autoconf.CheckLibWithHeader('dbi', 'dbi/dbi.h', 'C'): |