summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan B├╝hler <stbuehler@web.de>2017-10-24 12:21:18 +0200
committerGlenn Strauss <gstrauss@gluelogic.com>2017-10-28 22:41:32 -0400
commit96e198d6215af3434eeeb1e31c43a7188663e826 (patch)
tree428be5b7973c65686203016fca996d49b168c9cf
parent2506e21b08e271426b9b1959b36537ea4835b2ac (diff)
downloadlighttpd1.4-96e198d6215af3434eeeb1e31c43a7188663e826.tar.gz
lighttpd1.4-96e198d6215af3434eeeb1e31c43a7188663e826.zip
[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.
-rw-r--r--SConstruct5
1 files changed, 1 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 8acc4085..a9838786 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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'):