0001-autoconf-variable-cache-option-for-getcwd-test.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950
  1. From 9d14fad412a497fe83cfc6ab594ddc612512f02a Mon Sep 17 00:00:00 2001
  2. From: Matt Weber <matthew.weber@rockwellcollins.com>
  3. Date: Thu, 4 Jun 2020 20:34:11 -0500
  4. Subject: [PATCH] autoconf variable cache option for getcwd test
  5. The cached variable allows cross compiled builds to successfully set the
  6. desired default for this value without invoking a test.
  7. Fixes:
  8. https://issues.apache.org/jira/browse/SANTUARIO-549
  9. Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
  10. ---
  11. configure.ac | 20 ++++++++++++--------
  12. 1 file changed, 12 insertions(+), 8 deletions(-)
  13. diff --git a/configure.ac b/configure.ac
  14. index b43d7a5..c3d4489 100644
  15. --- a/configure.ac
  16. +++ b/configure.ac
  17. @@ -74,14 +74,18 @@ AC_CHECK_FUNCS([strcasecmp])
  18. # Check whether getcwd can dynamically allocate memory.
  19. AC_MSG_CHECKING([whether getcwd(NULL, 0) works])
  20. -AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <stdlib.h>
  21. - #include <unistd.h>],
  22. -[char *cwd = getcwd(NULL, 0);
  23. -return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])],
  24. - [AC_MSG_RESULT(yes)
  25. - AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1],
  26. - [Define to 1 if getcwd(NULL, 0) works])],
  27. - [AC_MSG_RESULT(no)])
  28. +AC_CACHE_VAL([xml_cv_func_getcwd_null],
  29. +[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
  30. + #include <unistd.h>
  31. + char *cwd = getcwd(NULL, 0);
  32. + return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;]])],
  33. + [xml_cv_func_getcwd_null=yes],
  34. + [xml_cv_func_getcwd_null=no])])
  35. +AC_MSG_RESULT([$xml_cv_func_getcwd_null])
  36. +if test $xml_cv_func_getcwd_null = yes; then
  37. +AC_DEFINE([XSEC_HAVE_GETCWD_DYN], [1],
  38. + [Define to 1 if getcwd(NULL, 0) works])
  39. +fi
  40. AC_LANG(C++)
  41. --
  42. 2.17.1