[gnome-characters] build: Hook Gnulib to the build infrastructure

[Daiki Ueno <dueno src gnome org>]

commit 38f866b8e53bb470a3020df095663a6e7b8e22e0
Author: Daiki Ueno <dueno src gnome org>
Date:   Tue Jan 20 15:05:30 2015 +0900

    build: Hook Gnulib to the build infrastructure

 Makefile.am     |    6 +++---
 configure.ac    |    9 ++++-----
 lib/Makefile.am |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fc7bdfa..c9ccbed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
-ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I m4 -I glm4 ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS = --disable-dogtail
 
-SUBDIRS = po data lib src tests
+SUBDIRS = po data gllib lib src tests
 
 MAINTAINERCLEANFILES = \
        $(srcdir)/INSTALL \
@@ -47,6 +47,6 @@ rpm: dist
 clean-local:
        rm -fR $(builddir)/rpms
 
-EXTRA_DIST = COPYINGv2 $(PACKAGE_NAME).spec
+EXTRA_DIST = COPYINGv2 $(PACKAGE_NAME).spec  glm4/gnulib-cache.m4
 
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index c96ee1b..c05f084 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,9 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 IT_PROG_INTLTOOL([0.50.1])
 
 AC_PROG_CC
+gl_EARLY
+gl_INIT
+
 AM_PROG_CC_C_O
 LT_INIT([disable-static])
 
@@ -77,16 +80,12 @@ GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
 AC_SUBST(GLIB_COMPILE_RESOURCES)
 
 PKG_CHECK_MODULES([LIBGC], [gio-2.0 gtk+-3.0 pango])
-AC_CHECK_HEADERS([unictype.h uniname.h], ,
-  [AC_MSG_ERROR([can't find libunistring headers])])
-AC_CHECK_LIB([unistring], [unicode_character_name],
-  LIBGC_LIBS="$LIBGC_LIBS -lunistring",
-  [AC_MSG_ERROR([can't find libunistring])])
 
 AC_CONFIG_FILES([
   Makefile
   data/Makefile
   data/icons/Makefile
+  gllib/Makefile
   lib/Makefile
   src/Makefile
   tests/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e4508a4..1ad2adf 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS =                                   \
 
 pkglib_LTLIBRARIES = libgc.la
 
-libgc_la_LIBADD = $(LIBGC_LIBS)
+libgc_la_LIBADD = $(LIBGC_LIBS) $(LTLIBICONV) $(LTLIBUNISTRING) $(builddir)/../gllib/libgnu.la
 libgc_la_LDFLAGS = -avoid-version
 libgc_la_sources = gc.h gc.c
 libgc_la_SOURCES = $(libgc_la_sources) confusables.h