From 29b049f1f974529adfc06afa3a3aec1741639d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@flameeyes.eu>
Date: Mon, 9 Apr 2012 11:57:09 -0700
Subject: [PATCH] build: fix `make distcheck` with the local glib copy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
---
 Makefile.am  | 4 +++-
 configure.ac | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 67df5a0..a79c239 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,4 +41,6 @@ clean-generic:
 	rm -rf autom4te*.cache 
 	rm -f *.rej *.orig *~
 
-SUBDIRS = $(GLIB_SUBDIR)
+if LOCAL_GLIB
+SUBDIRS = glib-local
+endif
diff --git a/configure.ac b/configure.ac
index 27c0d8f..527aad4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,14 +52,14 @@ AS_IF(
   [
   GLIB_CFLAGS=-I./glib-local
   GLIB_LIBS=glib-local/libglib.a
-  GLIB_SUBDIR=glib-local
   AC_SUBST(GLIB_CFLAGS)
   AC_SUBST(GLIB_LIBS)
-  AC_SUBST(GLIB_SUBDIR)
   AC_MSG_WARN(Using locale implementation of GList functions)
   ]
 )
 
+AM_CONDITIONAL([LOCAL_GLIB], [test "x$local_glib2" = "xyes"])
+
 LIBCAP_NG_PATH
 
 AC_OUTPUT(Makefile glib-local/Makefile)