diff options
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | glusterfs.spec.in | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 7392b706bb8..5fe304abf4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1196,14 +1196,9 @@ AC_ARG_ENABLE([cmocka], [Enable cmocka build options.])) if test "x$enable_cmocka" = "xyes"; then BUILD_UNITTEST="yes" - PKG_CHECK_MODULES([UNITTEST], [cmocka], [],[ - AC_CHECK_LIB([cmocka], [mock_assert], [ - UNITTEST_LDFLAGS="-lcmocka -lgcov" - UNITTEST_CFLAGS="-Wall -Werror" - ], [ - AC_MSG_ERROR([cmocka library is required to build glusterfs]) - ]) - ]) + PKG_CHECK_MODULES([UNITTEST], [cmocka >= 1.0.1], [BUILD_UNITTEST="yes"], + [AC_MSG_ERROR([cmocka library is required to build glusterfs])] + ) fi AM_CONDITIONAL([UNITTEST], [test x$BUILD_UNITTEST = xyes]) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index f71ba1a1903..9390bb24137 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -204,8 +204,8 @@ BuildRequires: libaio-devel libacl-devel BuildRequires: python-devel BuildRequires: python-ctypes BuildRequires: userspace-rcu-devel >= 0.7 -%if ( 0%{?_with_cmocka:0} ) -BuildRequires: libcmocka-devel >= 1.0.0 +%if ( 0%{?_with_cmocka:1} ) +BuildRequires: libcmocka-devel >= 1.0.1 %endif BuildRequires: sqlite-devel %if ( 0%{!?_without_systemtap:1} ) |