diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-16 09:07:41 +1000 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@canonical.com> | 2012-05-18 12:50:33 -0700 |
| commit | 31b64e0fbc8dfe420d51e325c67a07e2eaa413f7 (patch) | |
| tree | cbfc0d47e8a0eb208ff86e1e043d3f0f6aeb52a0 /aclocal | |
| parent | 6b66ce9fc632108a765a8e96cd287b6179f9cbb0 (diff) | |
m4: if a source is specified, use that for the include path
Don't require users to specify both source and include path. We can assume
that if they have the source at a certain location, they want those headers
too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
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] |