diff options
| author | Roger Leigh <rleigh@debian.org> | 2013-09-07 23:21:13 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2013-09-08 18:17:29 +0100 |
| commit | a17bdde2ad0fb7b3c5e1d8dc9da538101944658a (patch) | |
| tree | 2791b5810ae5c2eba9aa67674fc7e8cb5b0b1e88 | |
| parent | 2fedb9f489f418242d0055f2d6d43ee0c085780c (diff) | |
| download | schroot-a17bdde2ad0fb7b3c5e1d8dc9da538101944658a.tar.gz | |
build: Configure gtest with GTEST_ROOT
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index cdec6a08..c7af6ccd 100644 --- a/configure.ac +++ b/configure.ac @@ -85,7 +85,7 @@ AC_SUBST([SBUILD_INTERFACE_AGE]) AC_SUBST([SBUILD_BINARY_AGE]) dnl Initialise automake stuff. -AM_INIT_AUTOMAKE([1.10 gnu -Wno-portability subdir-objects check-news dist-xz no-dist-gzip tar-pax]) +AM_INIT_AUTOMAKE([1.10 gnu -Wno-portability subdir-objects check-news dist-xz no-dist-gzip tar-pax serial-tests]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) RELEASE_DATE='m4_esyscmd_s(date --date='m4_esyscmd_s([sed -ne '/^Release-Date:/{s/Release-Date:[[:space:]][[:space:]]*//p;q}' VERSION])' '+%s')' RELEASE_DATE_S='m4_esyscmd_s([sed -ne '/^Release-Date:/{s/Release-Date:[[:space:]][[:space:]]*//p;q}' VERSION])' @@ -304,6 +304,9 @@ AC_DEFINE_UNQUOTED(SBUILD_HOST_CPU, ["$host_cpu"]) AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes]) AC_MSG_CHECKING([for gtest]) +if test -d "$GTEST_ROOT"; then + LDFLAGS="$LDFLAGS -L$GTEST_ROOT" +fi GTEST_LIBS="-lgtest" saved_CFLAGS="${CFLAGS}" saved_LIBS="${LIBS}" |