diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-13 11:42:04 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-13 11:42:04 +0200 |
| commit | d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a (patch) | |
| tree | b50ae20ca22bc564b145906d6c84395285933859 /mesalib/configure.ac | |
| parent | 120bd371deb2b73a0bae5ce331511e4ea27bcff2 (diff) | |
| parent | fffd436e9c2ec6f5aa501ee57d0e4ade7293ee60 (diff) | |
| download | vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.tar.gz vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.tar.bz2 vcxsrv-d2d4fd66a0c1fca50d07fce3f383d6a84a57f09a.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/configure.ac')
| -rw-r--r-- | mesalib/configure.ac | 15 |
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 |