summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2017-03-13 11:15:47 +0800
committerPeng Wu <alexepico@gmail.com>2017-03-13 11:15:47 +0800
commit1e8c9d034689ae9dc556a2f3be37b498cc3d193b (patch)
treef4f59760ccfd1a1a6c8095dabb469dfb1e35fd34
parent2919d7d4b9facf175d4da33418dfbb9945f4bb15 (diff)
downloadlibpinyin-1e8c9d034689ae9dc556a2f3be37b498cc3d193b.tar.gz
libpinyin-1e8c9d034689ae9dc556a2f3be37b498cc3d193b.tar.xz
libpinyin-1e8c9d034689ae9dc556a2f3be37b498cc3d193b.zip
use m4 macros
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
2 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 01c2500..f800b24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ MAINTAINERCLEANFILES = Makefile.in
CLEANFILES = *.bak
-ACLOCAL = aclocal -I .
+ACLOCAL_AMFLAGS = -I m4
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libpinyin.pc
diff --git a/configure.ac b/configure.ac
index d98f5e9..cd33be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,10 @@ m4_define([libpinyin_binary_version],
AC_PREREQ(2.60)
AC_INIT([libpinyin], [libpinyin_version], [https://github.com/libpinyin/libpinyin/issues/new])
AM_INIT_AUTOMAKE
+
AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_HEADER([config.h])
+AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
# Define a string for binary compatibility