29 lines
1.2 KiB
Diff
29 lines
1.2 KiB
Diff
From 638327519b9b04f3c105280f49f29e509c06a9ce Mon Sep 17 00:00:00 2001
|
|
From: Martchus <martchus@gmx.net>
|
|
Date: Sun, 18 Sep 2016 18:58:25 +0200
|
|
Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL
|
|
|
|
---
|
|
src/plugins/sqldrivers/configure.json | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
|
|
index babd0465ce..b4b3bdec6b 100644
|
|
--- a/src/plugins/sqldrivers/configure.json
|
|
+++ b/src/plugins/sqldrivers/configure.json
|
|
@@ -88,9 +88,9 @@
|
|
},
|
|
"headers": "libpq-fe.h",
|
|
"sources": [
|
|
- { "type": "pkgConfig", "args": "libpq" },
|
|
{ "type": "psqlConfig" },
|
|
- { "type": "psqlEnv", "libs": "-llibpq -lws2_32 -ladvapi32", "condition": "config.win32" },
|
|
+ { "type": "psqlEnv", "libs": "-lpq -lintl -lssl -lcrypto -lshell32 -lws2_32 -lsecur32 -liconv", "condition": "config.win32 && !features.shared" },
|
|
+ { "type": "psqlEnv", "libs": "-lpq", "condition": "config.win32 && features.shared" },
|
|
{ "type": "psqlEnv", "libs": "-lpq", "condition": "!config.win32" }
|
|
]
|
|
},
|
|
--
|
|
2.23.0
|
|
|