>From eb22af0ff376cf39de9af515bdffcf42b2a1180a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <address@hidden>
Date: Fri, 26 Apr 2019 19:26:47 +0200
Subject: [PATCH 2/7] Update autoconf files.

Multiple thing:
- Update which macros are used to get autotools to stop complaining.
- Change how Guile version is detected.
- Add guile 2.2 as an alternative guile version.
- Change flags to guile-snarf to reflect above changes.
- Update changed names.
---
 Makefile.am  | 4 +++-
 configure.ac | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4720a63..29353b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,8 @@ libguilexlib_la_SOURCES = guile-xlib.c $(BUILT_SOURCES)
 libguilexlib_la_LDFLAGS = -version-info 0:0 -export-dynamic 
 libguilexlib_la_CFLAGS = $(GUILE_CFLAGS)
 libguilexlib_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS) $(GUILE_LIBS)
+libguilexlib_ladir = $(includedir)
+libguilexlib_la_HEADERS = guile-xlib.h
 
 scmdatadir = $(datadir)/guile/xlib
 scmdata_DATA = xlib.scm
@@ -24,7 +26,7 @@ EXTRA_DIST = $(scmdata_DATA) autogen.sh
 SUFFIXES = .x
 SNARF = guile-snarf
 .c.x:
-	$(SNARF) $(DEFS) $(INCLUDES) $(GUILE_CFLAGS) $(CPPFLAGS) $(CFLAGS) $< > $@
+	$(SNARF) -o $@ $(INCLUDES) $(GUILE_CFLAGS) $(CPPFLAGS) $<
 
 info_TEXINFOS = guile-xlib.texi
 guile_xlib_TEXINFOS = xlib.texi
diff --git a/configure.ac b/configure.ac
index 1bfe878..b1ff6b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,8 @@ AM_INIT_AUTOMAKE
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE
 
-PKG_CHECK_MODULES([GUILE], [guile-2.0])
+GUILE_PKG([2.2 2.0])
+GUILE_FLAGS
 
 AC_PROG_CC
 AC_PROG_CPP
-- 
2.21.0