- fix building with guile 3.0, rel 3

diff --git a/autogen.spec b/autogen.spec
index d6e156d052020a51930d68656f4d9c0acc7a97f8..1fa4078e0f8b77024e72ff792d9c44a216be81f4 100644 (file)
--- a/autogen.spec
+++ b/autogen.spec
@@ -2,7 +2,7 @@ Summary:        Automated program generator
 Summary(pl.UTF-8):     Zautomatyzowany generator programów
 Name:          autogen
 Version:       5.18.16
-Release:       2
+Release:       3
 License:       GPL v3+ (AutoGen), LGPL v2+ (genshell), LGPL v3+ or Modified BSD (AutoOpts library)
 Group:         Development/Tools
 Source0:       http://ftp.gnu.org/gnu/autogen/rel%{version}/%{name}-%{version}.tar.xz
@@ -11,6 +11,7 @@ Patch0:               %{name}-notinstalled.patch
 Patch1:                %{name}-info.patch
 Patch2:                %{name}-ksh.patch
 Patch3:                %{name}-format-truncate.patch
+Patch4:                guile3.0.patch
 URL:           http://autogen.sourceforge.net/
 BuildRequires: guile-devel >= 5:2.0
 BuildRequires: libltdl-devel
@@ -83,11 +84,17 @@ Statyczna biblioteka AutoOpts.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # force regeneration
 %{__rm} doc/autogen.info*
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 # don't require recent gcc just because of 'pragma GCC diagnostic ignored "-Wformat-truncation"'
 CFLAGS="%{rpmcflags} -Wno-error=pragmas"
 %configure \

diff --git a/guile3.0.patch b/guile3.0.patch
new file mode 100644 (file)
index 0000000..babdcef
--- /dev/null
+++ b/guile3.0.patch
@@ -0,0 +1,40 @@
+--- autogen-5.18.16/config/guile.m4~   2018-08-26 19:44:19.000000000 +0200
++++ autogen-5.18.16/config/guile.m4    2022-03-12 13:25:01.248062089 +0100
+@@ -61,7 +61,7 @@
+ #
+ AC_DEFUN([GUILE_PKG],
+  [PKG_PROG_PKG_CONFIG
+-  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
++  _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
+@@ -237,7 +237,7 @@
+ AC_DEFUN([GUILE_PROGS],
+  [_guile_required_version="m4_default([$1], [$GUILE_EFFECTIVE_VERSION])"
+   if test -z "$_guile_required_version"; then
+-    _guile_required_version=2.2
++    _guile_required_version=3.0
+   fi
+ 
+   _guile_candidates=guile
+--- autogen-5.18.16/agen5/guile-iface.h~       2018-08-26 19:44:48.000000000 +0200
++++ autogen-5.18.16/agen5/guile-iface.h        2022-03-12 13:31:35.236915503 +0100
+@@ -9,16 +9,12 @@
+ # error AutoGen does not work with this version of Guile
+   choke me.
+ 
+-#elif GUILE_VERSION < 203000
++#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))
+ # define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
+ # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
+-
+-#else
+-# error unknown GUILE_VERSION
+-  choke me.
+ #endif
+ 
+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */