0001-configure-ac-tweak-CPPUNIT-conditional.patch 1.5 KB

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