diff options
author | Paul Baltescu <pauldb89@gmail.com> | 2013-02-21 14:36:15 +0000 |
---|---|---|
committer | Paul Baltescu <pauldb89@gmail.com> | 2013-02-21 14:36:15 +0000 |
commit | fc4f0096022eae920ddfbbe9c1b0314b38bb28bb (patch) | |
tree | 782fab70507dbabe90186296122d54a14e49241e | |
parent | bca26d953a774b8efca12f30407390b3f5eef9d0 (diff) |
Fix for configure script.
-rw-r--r-- | configure.ac | 13 |
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 |