[gnome-characters] build: Prefer glm4 over m4 for local macros

[Daiki Ueno <dueno src gnome org>]

commit 2aa2ab8b017f66b371ab1fbfa80e81a9a5fd603e
Author: Daiki Ueno <dueno src gnome org>
Date:   Fri Aug 25 09:55:01 2017 +0200

    build: Prefer glm4 over m4 for local macros
    
    autopoint installs an older/incompatible version of wint_t.m4 in m4,
    while we are shipping a newer version in glm4.  That was causing a
    build failure on Continuous:
    http://build.gnome.org/continuous/buildmaster/builds/2017/08/24/36/build/log-gnome-characters.txt

 Makefile.am  |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 2daa93f..ee52183 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4 -I glm4 ${ACLOCAL_FLAGS}
+ACLOCAL_AMFLAGS = -I glm4 -I m4 ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS = --disable-dogtail
 
 SUBDIRS = po data gllib lib src tests
diff --git a/configure.ac b/configure.ac
index d41cd6a..b4ae2bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT([org.gnome.Characters], [3.22.0],
         [gnome-characters])
 
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_MACRO_DIRS([glm4 m4])
 
 AM_INIT_AUTOMAKE([1.12 dist-xz no-dist-gzip foreign tar-ustar no-define serial-tests -Wno-portability])
 # revert automake using PACKAGE_TARNAME instead of PACKAGE_NAME