summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <thiago@mapbox.com>2015-03-16 10:50:34 +0200
committerThiago Marcos P. Santos <thiago@mapbox.com>2015-03-16 10:54:34 +0200
commitd66b24f58f7744e6fc5bf78b581c65a5cd3265a5 (patch)
tree56450377a22695029fa5e5a6c8a272c7422c6f4d
parent0c985c024b4db6c8063648d493830c67ebff50bc (diff)
downloadqtlocation-mapboxgl-d66b24f58f7744e6fc5bf78b581c65a5cd3265a5.tar.gz
Link with X11 explicitly
We are using X11 symbols directly like XFree() so we need to link with it explicitly. Previously these symbols were being resolved somehow by libGL, but apparently they are now hidden - good - in the custom version we are using since 5e40f72b7. Fixes #1005.
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index a60fd52d04..1d68f5e54b 100755
--- a/configure
+++ b/configure
@@ -128,8 +128,8 @@ if [ ! -z ${GLFW_VERSION} ]; then
fi
if [ ${MASON_PLATFORM} == 'linux' ]; then
- CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl --cflags)),"$LN
- CONFIG+=" 'opengl_ldflags%': $(quote_flags $(pkg-config gl --libs)),"$LN
+ CONFIG+=" 'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN
+ CONFIG+=" 'opengl_ldflags%': $(quote_flags $(pkg-config gl x11 --libs)),"$LN
else
CONFIG+=" 'opengl_cflags%': $(quote_flags),"$LN
CONFIG+=" 'opengl_ldflags%': $(quote_flags),"$LN