diff options
Diffstat (limited to 'aclocal')
| -rw-r--r-- | aclocal/xorg-gtest.m4 | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/aclocal/xorg-gtest.m4 b/aclocal/xorg-gtest.m4 index 52dd5aa..062842c 100644 --- a/aclocal/xorg-gtest.m4 +++ b/aclocal/xorg-gtest.m4 @@ -1,4 +1,4 @@ -# serial 1 +# serial 2 # Copyright (C) 2012 Canonical, Ltd. # @@ -27,17 +27,17 @@ # source location respectively. AC_DEFUN([_CHECK_GTEST], [ - AC_ARG_WITH([gtest-include-path], - [AS_HELP_STRING([--with-gtest-include-path], - [location of the Google test headers])], - [GTEST_CPPFLAGS="-I$withval"]) - AC_ARG_WITH([gtest-source-path], [AS_HELP_STRING([--with-gtest-source-path], [location of the Google test sources, defaults to /usr/src/gtest])], - [GTEST_SOURCE="$withval"], + [GTEST_SOURCE="$withval"; GTEST_CPPFLAGS="-I$withval/include"], [GTEST_SOURCE="/usr/src/gtest"]) + AC_ARG_WITH([gtest-include-path], + [AS_HELP_STRING([--with-gtest-include-path], + [location of the Google test headers])], + [GTEST_CPPFLAGS="-I$withval"]) + GTEST_CPPFLAGS="$GTEST_CPPFLAGS -I$GTEST_SOURCE" AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc] |