[PATCH xorg-gtest] aclocal: set the proper include path for the default source path

Peter Hutterer peter.hutterer at who-t.net
Sun Aug 26 17:58:59 PDT 2012


If a gtest source path is given, the include path is adjusted accordingly.
If we fall back to the default /usr/src/gtest we only set the include path
to -I/usr/src/gtest but none of the headers are there.
Fix that by appending the right source path.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 aclocal/xorg-gtest.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aclocal/xorg-gtest.m4 b/aclocal/xorg-gtest.m4
index d6a75af..e180b56 100644
--- a/aclocal/xorg-gtest.m4
+++ b/aclocal/xorg-gtest.m4
@@ -1,4 +1,4 @@
-# serial 6
+# serial 7
 
 # Copyright (C) 2012 Canonical, Ltd.
 #
@@ -36,7 +36,7 @@ AC_DEFUN([_CHECK_GTEST],
                   *) AC_MSG_ERROR([gtest-source-path must be an absolute path ('$withval')]) ;;
                esac
               ],
-              [GTEST_SOURCE="/usr/src/gtest"])
+              [GTEST_SOURCE="/usr/src/gtest"; GTEST_CPPFLAGS="-I$GTEST_SOURCE/include"])
 
   AC_ARG_WITH([gtest-include-path],
               [AS_HELP_STRING([--with-gtest-include-path],
-- 
1.7.11.2



More information about the xorg-devel mailing list