On 08/26/2012 05:58 PM, Peter Hutterer wrote:
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 <[email protected]>
---
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],
Ok, this should be harmless if it's incorrect, and it should fix things
if you only have the source unpacked somewhere.
Reviewed-by: Chase Douglas <[email protected]>
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
