Use m4 directory

mroonga · Sep 28, 2015 · 30451c3 · 30451c3
1 parent 57f3cc1
commit 30451c3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,7 @@ cscope.out
 cmake_install.cmake
 CTestTestfile.cmake
 /.dirstamp
+/m4
 /aclocal.m4
 /autom4te.cache
 /config.guess

diff --git a/Makefile.am b/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.9.7
 LOCALES = ja
 
 AM_CPPFLAGS = $(MYSQL_INCLUDES) $(GROONGA_CFLAGS) -I$(top_srcdir)/lib
-ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS
+ACLOCAL_AMFLAGS = -I m4 $$ACLOCAL_ARGS
 
 include sources.am
 

diff --git a/autogen.sh b/autogen.sh
@@ -104,6 +104,8 @@ fi
 
 set -e
 
+mkdir -p m4
+
 echo "Running libtoolize ..."
 $LIBTOOLIZE --force --copy
 echo "Running aclocal ..."

diff --git a/configure.ac b/configure.ac
@@ -8,6 +8,7 @@ m4_define([mrn_version_in_hex], m4_include(version_in_hex))
 m4_define([mrn_plugin_version], m4_include(plugin_version))
 
 AC_INIT([mroonga], [mrn_version], [groonga-talk@lists.sourceforge.net])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
 AM_INIT_AUTOMAKE([tar-pax foreign subdir-objects])