summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@qt.io>2019-03-25 12:40:36 +0100
committerGatis Paeglis <gatis.paeglis@qt.io>2019-03-25 13:50:49 +0000
commitc3226bd5cc6bf009d2fb3c233a09f3ef5cf618e9 (patch)
tree67eb51bc5f2c3b10d487d630e1ed23b61f980643
parentd8323376670fdc65e4a4a654def8b78b650bdbe7 (diff)
configure: add linker flags for xkbcommon* when pkg-config not present
Without this, xkbcommon feature would not be detected even if all xkbcommon dev libs are present. Change-Id: Ic247461dda9e7ddfed547708cccaad88f123903b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--src/gui/configure.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index e4f25ab313..6fdcd562a7 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -764,7 +764,8 @@
},
"headers": [ "xkbcommon/xkbcommon.h" ],
"sources": [
- { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" }
+ { "type": "pkgConfig", "args": "xkbcommon >= 0.5.0" },
+ "-lxkbcommon"
]
},
"xkbcommon_x11": {
@@ -774,7 +775,8 @@
},
"headers": [ "xkbcommon/xkbcommon-x11.h" ],
"sources": [
- { "type": "pkgConfig", "args": "xkbcommon-x11" }
+ { "type": "pkgConfig", "args": "xkbcommon-x11" },
+ "-lxkbcommon -lxkbcommon-x11"
]
},
"xrender": {