1*4882a593SmuzhiyunFrom 8e7da14647dada5eee8f583b0814bffb31d1b91e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 21 Apr 2019 23:17:34 +0200 4*4882a593SmuzhiyunSubject: [PATCH] configure.ac: tweak CPPUNIT conditional 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunFollowing review of buildroot's patch 7*4882a593Smuzhiyun(http://patchwork.ozlabs.org/patch/1088520), tweak CPPUNIT to move call 8*4882a593Smuzhiyunto AM_CONDITIONAL outside condition 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 11*4882a593Smuzhiyun[Retrieved from: 12*4882a593Smuzhiyunhttps://github.com/linknx/linknx/commit/8e7da14647dada5eee8f583b0814bffb31d1b91e] 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun configure.ac | 10 ++++------ 15*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 6 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 18*4882a593Smuzhiyunindex 51d8ae66..4d9d8efa 100644 19*4882a593Smuzhiyun--- a/configure.ac 20*4882a593Smuzhiyun+++ b/configure.ac 21*4882a593Smuzhiyun@@ -135,22 +135,20 @@ if test x"$WITH_CPPUNIT" != xno; then 22*4882a593Smuzhiyun AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit]) 23*4882a593Smuzhiyun AC_SUBST(CPPUNIT_CFLAGS) 24*4882a593Smuzhiyun AC_SUBST(CPPUNIT_LIBS) 25*4882a593Smuzhiyun- AM_CONDITIONAL(CPPUNIT, true) 26*4882a593Smuzhiyun+ found_cppunit=yes 27*4882a593Smuzhiyun ],[ 28*4882a593Smuzhiyun AC_MSG_RESULT([no]) 29*4882a593Smuzhiyun- AM_CONDITIONAL(CPPUNIT, false) 30*4882a593Smuzhiyun ]) 31*4882a593Smuzhiyun else 32*4882a593Smuzhiyun PKG_CHECK_MODULES(CPPUNIT, $CPPUNITPC >= 1.9.6, [ 33*4882a593Smuzhiyun AC_DEFINE([HAVE_CPPUNIT], [1], [cppunit]) 34*4882a593Smuzhiyun AC_SUBST(CPPUNIT_CFLAGS) 35*4882a593Smuzhiyun AC_SUBST(CPPUNIT_LIBS) 36*4882a593Smuzhiyun- AM_CONDITIONAL([CPPUNIT], true) 37*4882a593Smuzhiyun- ],[AM_CONDITIONAL([CPPUNIT], false)]) 38*4882a593Smuzhiyun+ found_cppunit=yes 39*4882a593Smuzhiyun+ ]) 40*4882a593Smuzhiyun fi 41*4882a593Smuzhiyun-else 42*4882a593Smuzhiyun- AM_CONDITIONAL([CPPUNIT], false) 43*4882a593Smuzhiyun fi 44*4882a593Smuzhiyun+AM_CONDITIONAL([CPPUNIT], [test x"$found_cppunit" = xyes]) 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun dnl ######################################################################### 47*4882a593Smuzhiyun dnl Check if using log4cpp 48