From c7afac0aa6e51e6a49ebf13f72537398698c9e49 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 2 Oct 2012 14:44:47 -0400
Subject: [PATCH] Add AC_CONFIG_MACRODIR

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

diff --git a/Makefile.am b/Makefile.am
index ecaffd4..64b41da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
 
 NULL =
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src util test
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/configure.ac b/configure.ac
index c94b81f..93c08fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_INIT([HarfBuzz],
         [harfbuzz],
         [http://harfbuzz.org/])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([harfbuzz.pc.in])
 AC_CONFIG_HEADERS([config.h])
 
@@ -19,6 +20,7 @@ LT_INIT([disable-static])
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
+PKG_PROG_PKG_CONFIG([0.20])
 
 # Version
 m4_define(hb_version_triplet,m4_split(AC_PACKAGE_VERSION,[[.]]))
-- 
2.7.4