[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 Makefile.am  |    1 +
 configure.ac |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit c4a58ae0e2fa43fbf9ebefc83891f6abd6728ac9
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Aug 27 16:36:49 2012 +0900

    Fix for libtoolize's warnings

diff --git a/Makefile.am b/Makefile.am
index 4e664ff..f4203d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src \
 	conf.d $(DOCSRC) test
 
 AUTOMAKE_OPTIONS = dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
         fontconfig.pc.in \
diff --git a/configure.ac b/configure.ac
index 4de2d08..1270ba5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,7 @@ AC_SUBST(LIBT_CURRENT_MINUS_AGE)
 dnl ==========================================================================
 
 AC_CONFIG_HEADERS(config.h)
+AC_CONFIG_MACRO_DIR([m4])
 
 AC_PROG_CC
 AC_PROG_INSTALL