From 631a24d44b0d416c6c23fdf3c84d78ba2ff9ab35 Mon Sep 17 00:00:00 2001 From: Paul Baltescu Date: Thu, 21 Feb 2013 14:36:15 +0000 Subject: Fix for configure script. --- configure.ac | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'configure.ac') 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 -- cgit v1.2.3