From b4d0254581ba41aa7397c3b82d59478651f450f9 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 15 Dec 2017 09:44:33 -0500
Subject: [PATCH] build-sys: Fix use of libglnx configure bits

This fixes the build with `-Werror=undef` like we did in libostree.
And man is this obscure black magic.

Closes: #1156
Approved by: jlebon
---
 autogen.sh   | 2 ++
 configure.ac | 1 +
 2 files changed, 3 insertions(+)

diff --git a/autogen.sh b/autogen.sh
index 8e598c51..193db4b8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,6 +31,8 @@ fi
 # Workaround automake bug with subdir-objects and computed paths
 sed -e 's,$(libglnx_srcpath),'${srcdir}/libglnx,g < libglnx/Makefile-libglnx.am >libglnx/Makefile-libglnx.am.inc
 
+# FIXME - figure out how to get aclocal to find this by default
+ln -sf ../libglnx/libglnx.m4 buildutil/libglnx.m4
 
 autoreconf --force --install --verbose
 
diff --git a/configure.ac b/configure.ac
index 20d7ee46..dd3d66ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,6 +106,7 @@ AC_DEFINE([BUILDOPT_HAVE_RPMFILES], 1, [Set to 1 if we have rpmfiles API]),
 AC_PATH_PROG([XSLTPROC], [xsltproc])
 
 GLIB_TESTS
+LIBGLNX_CONFIGURE
 
 AC_CHECK_TOOL(GPERF, gperf)
 AS_IF([test -z "$GPERF"],