diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@digia.com> | 2014-01-18 01:23:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-20 19:24:39 +0100 |
| commit | 38813a3b328390fc3f1ff0f9201300edd6ff6f29 (patch) | |
| tree | a3ffb8a4bda7ca63b5f531c88ab486e42984a4f0 /configure | |
| parent | 260b0b4ed619055486766a7743ff094181829399 (diff) | |
Use pkg-config to find the prefix for X11 install
Needed to run the XKB extension where we used to expect X11 to be
installed in /usr. In FreeBSD, for instance, X11 is installed in
/usr/local like all the other not out-of-the-box packages.
Same thing goes for the compose platform input context plugin.
Change-Id: Ib7ace3117eaacc6e150394450d1330cba654ba8a
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -5130,6 +5130,14 @@ if [ "$CFG_XCB" != "no" ]; then else CFG_XCB="system" + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "x11" 2> /dev/null; then + QMAKE_X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`" + else + # default to LSB prefix + QMAKE_X11_PREFIX="/usr" + fi + QMakeVar set QMAKE_X11_PREFIX "$QMAKE_X11_PREFIX" + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists "xcb >= 1.5" 2>/dev/null; then XCB_PACKAGES="xcb xcb-shm xcb-sync xcb-xfixes xcb-randr xcb-image xcb-keysyms xcb-icccm" QMAKE_CFLAGS_XCB="`$PKG_CONFIG --cflags $XCB_PACKAGES 2>/dev/null`" |