guile-2.2.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879
  1. diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
  2. index 0aeabb0..6ce3520 100644
  3. --- a/agen5/guile-iface.h
  4. +++ b/agen5/guile-iface.h
  5. @@ -9,7 +9,7 @@
  6. # error AutoGen does not work with this version of Guile
  7. choke me.
  8. -#elif GUILE_VERSION < 201000
  9. +#else
  10. # define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
  11. # define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
  12. # define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
  13. @@ -24,9 +24,6 @@
  14. # define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
  15. # define AG_SCM_VEC_P(_v) scm_is_vector(_v)
  16. -#else
  17. -# error unknown GUILE_VERSION
  18. - choke me.
  19. #endif
  20. #endif /* MUTATING_GUILE_IFACE_H_GUARD */
  21. diff --git a/configure b/configure
  22. index befe20b..c4254eb 100755
  23. --- a/configure
  24. +++ b/configure
  25. @@ -14191,7 +14191,7 @@ $as_echo "no" >&6; }
  26. PKG_CONFIG=""
  27. fi
  28. fi
  29. - _guile_versions_to_search="2.0 1.8"
  30. + _guile_versions_to_search="2.2 2.0 1.8"
  31. if test -n "$GUILE_EFFECTIVE_VERSION"; then
  32. _guile_tmp=""
  33. for v in $_guile_versions_to_search; do
  34. diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
  35. index 0aeabb0..6ce3520 100644
  36. --- autogen-5.18.12/config/guile-orig.m4 2017-11-21 15:23:45.047606700 -0500
  37. +++ autogen-5.18.12/config/guile.m4 2017-11-21 15:24:20.414686700 -0500
  38. @@ -47,7 +47,7 @@
  39. # for an available version of Guile.
  40. #
  41. # By default, this macro will search for the latest stable version of
  42. -# Guile (e.g. 2.0), falling back to the previous stable version
  43. +# Guile (e.g. 2.2), falling back to the previous stable version
  44. # (e.g. 1.8) if it is available. If no guile-@var{VERSION}.pc file is
  45. # found, an error is signalled. The found version is stored in
  46. # @var{GUILE_EFFECTIVE_VERSION}.
  47. @@ -61,7 +61,7 @@
  48. #
  49. AC_DEFUN([GUILE_PKG],
  50. [PKG_PROG_PKG_CONFIG
  51. - _guile_versions_to_search="m4_default([$1], [2.0 1.8])"
  52. + _guile_versions_to_search="m4_default([$1], [2.2 1.8])"
  53. if test -n "$GUILE_EFFECTIVE_VERSION"; then
  54. _guile_tmp=""
  55. for v in $_guile_versions_to_search; do
  56. @@ -184,7 +184,7 @@
  57. # If @code{guile} is not found, signal an error.
  58. #
  59. # By default, this macro will search for the latest stable version of
  60. -# Guile (e.g. 2.0). x.y or x.y.z versions can be specified. If an older
  61. +# Guile (e.g. 2.2). x.y or x.y.z versions can be specified. If an older
  62. # version is found, the macro will signal an error.
  63. #
  64. # The effective version of the found @code{guile} is set to
  65. @@ -201,7 +201,7 @@
  66. [AC_PATH_PROG(GUILE,guile)
  67. _guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
  68. if test -z "$_guile_required_version"; then
  69. - _guile_required_version=2.0
  70. + _guile_required_version=2.2
  71. fi
  72. if test "$GUILE" = "" ; then
  73. AC_MSG_ERROR([guile required but not found])