From f0c5b1119c2df93c8791cce2dc5133e28bd12fe9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Thu, 13 Aug 2015 22:16:25 +0200
Subject: Include glib headers the right way.


diff --git a/xmlroff/libfo/fo-libfo-basic.h b/xmlroff/libfo/fo-libfo-basic.h
index 148f916..adc9084 100644
--- a/xmlroff/libfo/fo-libfo-basic.h
+++ b/xmlroff/libfo/fo-libfo-basic.h
@@ -11,8 +11,7 @@
 #define __FO_LIBFO_BASIC_H__
 
 #include <stdio.h>
-#include <glib/gtypes.h>
-#include <glib/gerror.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
-- 
2.2.2


From 4173249e806af3f609df0ce7072e38d2f51be214 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@gmail.com>
Date: Thu, 13 Aug 2015 22:22:49 +0200
Subject: Compatibility with modern autotoolsCompatibility with modern
 autotools..


diff --git a/xmlroff/configure.ac b/xmlroff/configure.ac
index 9e97d7f..7f6aa4d 100644
--- a/xmlroff/configure.ac
+++ b/xmlroff/configure.ac
@@ -31,7 +31,7 @@ AC_INIT([xmlroff XSL Formatter],
 	xmlroff_version(),
 	[http://xmlroff.org/newticket],
 	xmlroff)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 
 XMLROFF_VERSION_MAJOR=xmlroff_version_major()
 XMLROFF_VERSION_MINOR=xmlroff_version_minor()
-- 
2.2.2