aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-04-13 11:34:03 +0200
committermarha <marha@users.sourceforge.net>2012-04-13 11:34:03 +0200
commitfffd436e9c2ec6f5aa501ee57d0e4ade7293ee60 (patch)
tree6fbefab2db2acc7f2d5b066b06649ea88e0d6ab3 /mesalib/configure.ac
parent5f8448ef6b85a9ff72c5af4cec99183c8bb60dc6 (diff)
downloadvcxsrv-fffd436e9c2ec6f5aa501ee57d0e4ade7293ee60.tar.gz
vcxsrv-fffd436e9c2ec6f5aa501ee57d0e4ade7293ee60.tar.bz2
vcxsrv-fffd436e9c2ec6f5aa501ee57d0e4ade7293ee60.zip
fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012
Diffstat (limited to 'mesalib/configure.ac')
-rw-r--r--mesalib/configure.ac15
1 files changed, 2 insertions, 13 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 21e4308fa..65d358e0a 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -82,18 +82,6 @@ solaris*)
;;
esac
-AC_PATH_PROG([GTESTCONFIG], [gtest-config])
-if test "x$GTESTCONFIG" != "x"; then
- GTEST_CFLAGS=`gtest-config --cppflags --cxxflags`
- GTEST_LIBS=`gtest-config --ldflags --libs`
- AC_SUBST([GTEST_CFLAGS])
- AC_SUBST([GTEST_LIBS])
- HAVE_GTEST=yes
-else
- HAVE_GTEST=no
-fi
-AM_CONDITIONAL(HAVE_GTEST, test x$HAVE_GTEST = xyes)
-
dnl clang is mostly GCC-compatible, but its version is much lower,
dnl so we have to check for it.
AC_MSG_CHECKING([if compiling with clang])
@@ -794,7 +782,7 @@ dnl
dnl this variable will be prepended to SRC_DIRS and is not exported
CORE_DIRS=""
-SRC_DIRS=""
+SRC_DIRS="gtest"
GLU_DIRS="sgi"
GALLIUM_DIRS="auxiliary drivers state_trackers"
GALLIUM_TARGET_DIRS=""
@@ -1999,6 +1987,7 @@ AC_CONFIG_FILES([configs/autoconf
src/egl/wayland/wayland-drm/Makefile
src/glx/Makefile
src/mapi/shared-glapi/Makefile
+ src/gtest/Makefile
src/mesa/drivers/dri/dri.pc
src/mesa/drivers/dri/Makefile
src/mesa/drivers/dri/common/Makefile