diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-04 13:44:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-04 13:44:39 +0200 |
| commit | 2433c3693663c0ace48aee718c10a6b78207b7cf (patch) | |
| tree | 8c569c4af28c0e365d64d432957b20c9aa0b4953 /mesalib/configure.ac | |
| parent | fadba36545cbab5859bf346921bf416d0160a5b2 (diff) | |
| parent | 2ecad38adbeaa652daaab8f2a6d112921b7e74eb (diff) | |
| download | vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.tar.gz vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.tar.bz2 vcxsrv-2433c3693663c0ace48aee718c10a6b78207b7cf.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa libxcb git update 4 jul 2013
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 6832b0d89..3a0cd7791 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -1490,6 +1490,13 @@ AC_SUBST([EGL_NATIVE_PLATFORM]) AC_SUBST([EGL_PLATFORMS]) AC_SUBST([EGL_CFLAGS]) +# If we don't have the X11 platform, set this define so we don't try to include +# the X11 headers. +if ! echo "$egl_platforms" | grep -q 'x11'; then + DEFINES="$DEFINES -DMESA_EGL_NO_X11_HEADERS" + GL_PC_CFLAGS="$GL_PC_CFLAGS -DMESA_EGL_NO_X11_HEADERS" +fi + AC_ARG_WITH([egl-driver-dir], [AS_HELP_STRING([--with-egl-driver-dir=DIR], [directory for EGL drivers [[default=${libdir}/egl]]])], |