summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPaul Baltescu <pauldb89@gmail.com>2013-02-21 14:36:15 +0000
committerPaul Baltescu <pauldb89@gmail.com>2013-02-21 14:36:15 +0000
commit631a24d44b0d416c6c23fdf3c84d78ba2ff9ab35 (patch)
tree0055d8e9f1f65913f6ea8e0d93d87a0785f1f262 /configure.ac
parentb5491898549c61bd799d199aa9178a8394a1ef69 (diff)
Fix for configure script.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac13
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index ba1a83ea..22b8c451 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,6 +95,13 @@ AC_ARG_WITH(gtest,
[with_gtest=no]
)
+AM_CONDITIONAL([HAVE_GMOCK], false)
+AC_ARG_WITH(gmock,
+ [AC_HELP_STRING([--with-gmock=DIR], [(optional) path to Google Mock library])],
+ [with_gmock=$withval],
+ [with_gmock=no]
+ )
+
if test "x$with_gtest" != 'xno'
then
gtest_CPPFLAGS="-I${with_gtest}/include"
@@ -132,12 +139,6 @@ then
AC_SUBST(AS_TR_CPP([GTEST_LDFLAGS]), ["$gtest_LDFLAGS"])
AC_SUBST(AS_TR_CPP([GTEST_LIBS]), ["$gtest_LIBS"])
- AM_CONDITIONAL([HAVE_GMOCK], false)
- AC_ARG_WITH(gmock,
- [AC_HELP_STRING([--with-gmock=DIR], [(optional) path to Google Mock library])],
- [with_gmock=$withval],
- [with_gmock=no]
- )
if test "x$with_gmock" != 'xno'
then