Skip to content

Commit

Permalink
configure.ac: tweak CPPUNIT conditional
Browse files Browse the repository at this point in the history
Following review of buildroot's patch
(http://patchwork.ozlabs.org/patch/1088520), tweak CPPUNIT to move call
to AM_CONDITIONAL outside condition

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  • Loading branch information
ffontaine committed Apr 22, 2019
1 parent 66f3f76 commit 8e7da14
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions configure.ac
Expand Up @@ -135,22 +135,20 @@ if test x"$WITH_CPPUNIT" != xno; then
AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit])
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)
AM_CONDITIONAL(CPPUNIT, true)
found_cppunit=yes
],[
AC_MSG_RESULT([no])
AM_CONDITIONAL(CPPUNIT, false)
])
else
PKG_CHECK_MODULES(CPPUNIT, $CPPUNITPC >= 1.9.6, [
AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit])
AC_SUBST(CPPUNIT_CFLAGS)
AC_SUBST(CPPUNIT_LIBS)
AM_CONDITIONAL([CPPUNIT], true)
],[AM_CONDITIONAL([CPPUNIT], false)])
found_cppunit=yes
])
fi
else
AM_CONDITIONAL([CPPUNIT], false)
fi
AM_CONDITIONAL([CPPUNIT], [test x"$found_cppunit" = xyes])

dnl #########################################################################
dnl Check if using log4cpp
Expand Down

0 comments on commit 8e7da14

Please sign in to comment.