diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-15 16:56:14 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-15 16:56:14 +0200 |
| commit | f15a40afaf6d1b3a4841d25631f947da1b289f89 (patch) | |
| tree | f2066dc8caaf2fddd3b88251d18839d5878bfd9b /mesalib/configure.ac | |
| parent | f2a3390c8b2052e8f65d3502dd703b5c5b23a28e (diff) | |
| parent | 54db46582aba2252d544fa3956522f9ef06b49cb (diff) | |
| download | vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.gz vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.tar.bz2 vcxsrv-f15a40afaf6d1b3a4841d25631f947da1b289f89.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa pixman git update 15 oct 2012
Conflicts:
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index 6c7a1929e..aa72523c0 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -810,7 +810,7 @@ if test "x$enable_dri" = xyes; then fi dnl Find out if X is available. -PKG_CHECK_MODULES([X11], [x11]) +PKG_CHECK_MODULES([X11], [x11], [no_x=no], [no_x=yes]) dnl Try to tell the user that the --x-* options are only used when dnl pkg-config is not available. This must be right after AC_PATH_XTRA. |