projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
st/mesa: silence warnings in optimized builds
[mesa.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 4761c5972e840392559780c0397d43e642a1d125..5f30ae8f2a413e622d3c44b2a2e87df9a75379cd 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-823,8
+823,11
@@
if test "x$ax_pthread_ok" = xno; then
fi
dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
dnl to -pthread, which causes problems if we need -lpthread to appear in
fi
dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
dnl to -pthread, which causes problems if we need -lpthread to appear in
-dnl pkgconfig files.
-test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+dnl pkgconfig files. Since Android doesn't have a pthread lib, this check
+dnl is not valid for that platform.
+if test "x$android" = xno; then
+ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+fi
dnl pthread-stubs is mandatory on targets where it exists
case "$host_os" in
dnl pthread-stubs is mandatory on targets where it exists
case "$host_os" in
@@
-1358,7
+1361,6
@@
if test "x$with_sha1" = "x"; then
AC_MSG_ERROR([Cannot enable shader cache (no SHA-1 implementation found)])
fi
fi
AC_MSG_ERROR([Cannot enable shader cache (no SHA-1 implementation found)])
fi
fi
-AM_CONDITIONAL([ENABLE_SHADER_CACHE], [test x$enable_shader_cache = xyes])
if test "x$enable_shader_cache" = "xyes"; then
AC_DEFINE([ENABLE_SHADER_CACHE], [1], [Enable shader cache])
fi
if test "x$enable_shader_cache" = "xyes"; then
AC_DEFINE([ENABLE_SHADER_CACHE], [1], [Enable shader cache])
fi
@@
-2056,6
+2058,7
@@
for plat in $egl_platforms; do
;;
android)
;;
android)
+ PKG_CHECK_MODULES([ANDROID], [cutils hardware sync])
;;
*)
;;
*)
@@
-2682,7
+2685,6
@@
dnl Substitute the config
AC_CONFIG_FILES([Makefile
src/Makefile
src/amd/Makefile
AC_CONFIG_FILES([Makefile
src/Makefile
src/amd/Makefile
- src/amd/common/Makefile
src/amd/vulkan/Makefile
src/compiler/Makefile
src/egl/Makefile
src/amd/vulkan/Makefile
src/compiler/Makefile
src/egl/Makefile