projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i965: Move MOCS macros to brw_state.h.
[mesa.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index e1c60d842b57ab95282c07e378521f2d40174afd..df3eb6b29ac6a5b4838619bb37cc43cfa8e0aa4e 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-102,8
+102,8
@@
ZLIB_REQUIRED=1.2.8
dnl LLVM versions
LLVM_REQUIRED_GALLIUM=3.3.0
LLVM_REQUIRED_OPENCL=3.6.0
dnl LLVM versions
LLVM_REQUIRED_GALLIUM=3.3.0
LLVM_REQUIRED_OPENCL=3.6.0
-LLVM_REQUIRED_R600=3.
8
.0
-LLVM_REQUIRED_RADEONSI=3.
8
.0
+LLVM_REQUIRED_R600=3.
9
.0
+LLVM_REQUIRED_RADEONSI=3.
9
.0
LLVM_REQUIRED_RADV=3.9.0
LLVM_REQUIRED_SWR=3.9.0
LLVM_REQUIRED_RADV=3.9.0
LLVM_REQUIRED_SWR=3.9.0
@@
-269,7
+269,7
@@
DEFINES="-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
AC_SUBST([DEFINES])
android=no
case "$host_os" in
AC_SUBST([DEFINES])
android=no
case "$host_os" in
-*-android)
+*-android
*
)
android=yes
;;
linux*|*-gnu*|gnu*|cygwin*)
android=yes
;;
linux*|*-gnu*|gnu*|cygwin*)
@@
-724,7
+724,7
@@
dnl Arch/platform-specific settings
dnl
AC_ARG_ENABLE([asm],
[AS_HELP_STRING([--disable-asm],
dnl
AC_ARG_ENABLE([asm],
[AS_HELP_STRING([--disable-asm],
- [disable assembly usage @<:@default=enabled on supported plaforms@:>@])],
+ [disable assembly usage @<:@default=enabled on supported pla
t
forms@:>@])],
[enable_asm="$enableval"],
[enable_asm=yes]
)
[enable_asm="$enableval"],
[enable_asm=yes]
)
@@
-2146,7
+2146,7
@@
dnl DEPRECATED: EGL Platforms configuration
dnl
AC_ARG_WITH([egl-platforms],
[AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
dnl
AC_ARG_WITH([egl-platforms],
[AS_HELP_STRING([--with-egl-platforms@<:@=DIRS...@:>@],
- [DEPRECATED: use --with-plaforms instead@<:@default=auto@:>@])],
+ [DEPRECATED: use --with-pla
t
forms instead@<:@default=auto@:>@])],
[with_egl_platforms="$withval"],
[with_egl_platforms=auto])
[with_egl_platforms="$withval"],
[with_egl_platforms=auto])
@@
-2161,7
+2161,7
@@
if test "x$with_egl_platforms" = xauto; then
with_egl_platforms=""
fi
else
with_egl_platforms=""
fi
else
- AC_MSG_WARN([--with-egl-platforms is deprecated. Use --with-plaforms instead.])
+ AC_MSG_WARN([--with-egl-platforms is deprecated. Use --with-pla
t
forms instead.])
fi
dnl
fi
dnl
@@
-2466,7
+2466,9
@@
if test -n "$with_gallium_drivers"; then
xvirgl)
HAVE_GALLIUM_VIRGL=yes
require_libdrm "virgl"
xvirgl)
HAVE_GALLIUM_VIRGL=yes
require_libdrm "virgl"
- require_basic_egl "virgl"
+ if test "x$enable_egl" = xyes; then
+ require_basic_egl "virgl"
+ fi
;;
*)
AC_MSG_ERROR([Unknown Gallium driver: $driver])
;;
*)
AC_MSG_ERROR([Unknown Gallium driver: $driver])
@@
-2918,15
+2920,17
@@
echo " Static libs: $enable_static"
echo " Shared-glapi: $enable_shared_glapi"
dnl Compiler options
echo " Shared-glapi: $enable_shared_glapi"
dnl Compiler options
-# cleanup the CFLAGS/CXXFLAGS/DEFINES vars
+# cleanup the CFLAGS/CXXFLAGS/
LDFLAGS/
DEFINES vars
cflags=`echo $CFLAGS | \
$SED 's/^ *//;s/ */ /;s/ *$//'`
cxxflags=`echo $CXXFLAGS | \
$SED 's/^ *//;s/ */ /;s/ *$//'`
cflags=`echo $CFLAGS | \
$SED 's/^ *//;s/ */ /;s/ *$//'`
cxxflags=`echo $CXXFLAGS | \
$SED 's/^ *//;s/ */ /;s/ *$//'`
+ldflags=`echo $LDFLAGS | $SED 's/^ *//;s/ */ /;s/ *$//'`
defines=`echo $DEFINES | $SED 's/^ *//;s/ */ /;s/ *$//'`
echo ""
echo " CFLAGS: $cflags"
echo " CXXFLAGS: $cxxflags"
defines=`echo $DEFINES | $SED 's/^ *//;s/ */ /;s/ *$//'`
echo ""
echo " CFLAGS: $cflags"
echo " CXXFLAGS: $cxxflags"
+echo " LDFLAGS: $ldflags"
echo " Macros: $defines"
echo ""
if test "x$enable_llvm" = xyes; then
echo " Macros: $defines"
echo ""
if test "x$enable_llvm" = xyes; then