0001-Fix-install-when-HAVE_WCHAR-is-unset.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. From 5991f0d4b86c02a3d7739509b96815ccfa734be7 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fabrice.fontaine@orange.com>
  3. Date: Mon, 18 Dec 2017 17:17:54 +0100
  4. Subject: [PATCH] Fix install when HAVE_WCHAR is unset
  5. Don't build WCSNORM_xxx man pages if HAVE_WHCAR is not set otherwise
  6. installation will fail as the wcsnorm_mode enum is not defined in
  7. safe_str_lib.h when SAFECLIB_DISABLE_WCHAR is set
  8. Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
  9. ---
  10. Makefile.am | 15 +++++++++------
  11. 1 file changed, 9 insertions(+), 6 deletions(-)
  12. diff --git a/Makefile.am b/Makefile.am
  13. index 31398d1..b7e65a5 100644
  14. --- a/Makefile.am
  15. +++ b/Makefile.am
  16. @@ -142,12 +142,6 @@ dist_man_MANS += \
  17. doc/man/man3/SAFE_STR_PASSWORD_MIN_LENGTH.3 \
  18. doc/man/man3/STRTOK_DELIM_MAX_LEN.3 \
  19. doc/man/man3/TMP_MAX_S.3 \
  20. - doc/man/man3/WCSNORM_FCC.3 \
  21. - doc/man/man3/WCSNORM_FCD.3 \
  22. - doc/man/man3/WCSNORM_NFC.3 \
  23. - doc/man/man3/WCSNORM_NFD.3 \
  24. - doc/man/man3/WCSNORM_NFKC.3 \
  25. - doc/man/man3/WCSNORM_NFKD.3 \
  26. doc/man/man3/abort_handler_s.3 \
  27. doc/man/man3/abort_handler_s.c.3 \
  28. doc/man/man3/asctime_s.3 \
  29. @@ -461,6 +455,15 @@ dist_man_MANS += \
  30. doc/man/man3/wprintf_s.c.3 \
  31. doc/man/man3/wscanf_s.3 \
  32. doc/man/man3/wscanf_s.c.3
  33. +if ENABLE_WCHAR
  34. +dist_man_MANS += \
  35. + doc/man/man3/WCSNORM_FCC.3 \
  36. + doc/man/man3/WCSNORM_FCD.3 \
  37. + doc/man/man3/WCSNORM_NFC.3 \
  38. + doc/man/man3/WCSNORM_NFD.3 \
  39. + doc/man/man3/WCSNORM_NFKC.3 \
  40. + doc/man/man3/WCSNORM_NFKD.3
  41. +endif
  42. CLEANFILES += Doxyfile doc/footer README.md
  43. # avoid parallel doxygen
  44. --
  45. 2.7.4