diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-22 08:31:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-22 08:31:31 +0200 |
| commit | b318686d7779dab877e5fb33b7d97034cf8f44a8 (patch) | |
| tree | 8fd256304d1aac04400eead7b5f54743c472f233 /mesalib/configure.ac | |
| parent | 63f9a2c22dbac3e52e4d875bd70d729de5f81a43 (diff) | |
| parent | 34d741a3fc96c9424ffec29b114a1bdfde40f8b0 (diff) | |
| download | vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.tar.gz vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.tar.bz2 vcxsrv-b318686d7779dab877e5fb33b7d97034cf8f44a8.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 mesa pixman git update 22 oct 2012
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index aa72523c0..94392910f 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -172,7 +172,14 @@ esac dnl Add flags for gcc and g++ if test "x$GCC" = xyes; then - CFLAGS="$CFLAGS -Wall -std=c99" + case "$host_os" in + cygwin*) + CFLAGS="$CFLAGS -Wall -std=gnu99" + ;; + *) + CFLAGS="$CFLAGS -Wall -std=c99" + ;; + esac # Enable -Werror=implicit-function-declaration and # -Werror=missing-prototypes, if available, or otherwise, just @@ -1215,8 +1222,6 @@ if test "x$enable_gbm" = xyes; then if test "x$enable_shared_glapi" = xno; then AC_MSG_ERROR([gbm_dri requires --enable-shared-glapi]) fi - PKG_CHECK_MODULES([LIBKMS], [libkms], [], - AC_MSG_ERROR([gbm needs libkms])) fi fi GBM_PC_REQ_PRIV="libudev" @@ -1498,7 +1503,7 @@ for plat in $egl_platforms; do ;; wayland) - PKG_CHECK_MODULES([WAYLAND], [wayland-client wayland-server],, \ + PKG_CHECK_MODULES([WAYLAND], [wayland-client >= 0.99.0 wayland-server >= 0.99.0],, \ [AC_MSG_ERROR([cannot find libwayland-client])]) GALLIUM_WINSYS_DIRS="$GALLIUM_WINSYS_DIRS sw/wayland" @@ -1750,7 +1755,7 @@ radeon_llvm_check() { if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from: git://people.freedesktop.org/~tstellar/llvm master - and build with --enable-experimental-targets==AMDGPU]) + and build with --enable-experimental-targets=AMDGPU]) fi if test "x$LLVM_VERSION" = "x3.2"; then LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`" |