Merge pull request #1023 from Rmys/master

autogen:ver.bump
This commit is contained in:
Rmys
2020-01-03 20:06:58 +03:00
committed by GitHub
2 changed files with 48 additions and 1 deletions
@@ -0,0 +1,36 @@
diff --git a/agen5/guile-iface.h b/agen5/guile-iface.h
index 0aeabb0..6ce3520 100644
--- a/agen5/guile-iface.h
+++ b/agen5/guile-iface.h
@@ -9,7 +9,7 @@
# error AutoGen does not work with this version of Guile
choke me.
-#elif GUILE_VERSION < 201000
+#else
# define AG_SCM_IS_PROC(_p) scm_is_true( scm_procedure_p(_p))
# define AG_SCM_LIST_P(_l) scm_is_true( scm_list_p(_l))
# define AG_SCM_PAIR_P(_p) scm_is_true( scm_pair_p(_p))
@@ -24,9 +24,6 @@
# define AG_SCM_TO_ULONG(_v) ((unsigned long)scm_to_ulong(_v))
# define AG_SCM_VEC_P(_v) scm_is_vector(_v)
-#else
-# error unknown GUILE_VERSION
- choke me.
#endif
#endif /* MUTATING_GUILE_IFACE_H_GUARD */
diff --git a/configure b/configure
index befe20b..c4254eb 100755
--- a/configure
+++ b/configure
@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; }
PKG_CONFIG=""
fi
fi
- _guile_versions_to_search="2.0 1.8"
+ _guile_versions_to_search="2.2 2.0 1.8"
if test -n "$GUILE_EFFECTIVE_VERSION"; then
_guile_tmp=""
for v in $_guile_versions_to_search; do
+12 -1
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA>
<Summary>The automated text and program generation tool</Summary>
<Description>autogen is a tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text.</Description>
<Archive sha1sum="68e83f451ec699116577b0e0042b47393236c115" type="targz">https://ftp.gnu.org/gnu/autogen/rel5.18.10/autogen-5.18.10.tar.gz</Archive>
<Archive sha1sum="fff5c0bf812cb1c65ccb9f56d25f7c77914fa72c" type="targz">https://ftp.gnu.org/gnu/autogen/rel5.18.12/autogen-5.18.12.tar.gz</Archive>
<BuildDependencies>
<Dependency>gc-devel</Dependency>
<Dependency>gmp-devel</Dependency>
@@ -20,6 +20,10 @@
<Dependency>libxml2-devel</Dependency>
<Dependency>which</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">allow-guile-2.2.diff</Patch>
<!-- <Patch level="1">x.patch</Patch> -->
</Patches>
</Source>
<Package>
@@ -55,6 +59,13 @@
</Package>
<History>
<Update release="5">
<Date>2020-01-03</Date>
<Version>5.8.12</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="4">
<Date>2018-07-20</Date>
<Version>5.18.10</Version>