Kouhei Sutou
null+****@clear*****
Mon Sep 28 21:36:13 JST 2015
Kouhei Sutou 2015-09-28 21:36:13 +0900 (Mon, 28 Sep 2015) New Revision: 30451c38692350b22aed8dc5b50e4b7ec55e9638 https://github.com/mroonga/mroonga/commit/30451c38692350b22aed8dc5b50e4b7ec55e9638 Message: Use m4 directory Modified files: .gitignore Makefile.am autogen.sh configure.ac Modified: .gitignore (+1 -0) =================================================================== --- .gitignore 2015-09-14 15:31:07 +0900 (aaba8d7) +++ .gitignore 2015-09-28 21:36:13 +0900 (94d577e) @@ -14,6 +14,7 @@ cscope.out cmake_install.cmake CTestTestfile.cmake /.dirstamp +/m4 /aclocal.m4 /autom4te.cache /config.guess Modified: Makefile.am (+1 -1) =================================================================== --- Makefile.am 2015-09-14 15:31:07 +0900 (7800f92) +++ Makefile.am 2015-09-28 21:36:13 +0900 (83302b3) @@ -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 Modified: autogen.sh (+2 -0) =================================================================== --- autogen.sh 2015-09-14 15:31:07 +0900 (7a1d386) +++ autogen.sh 2015-09-28 21:36:13 +0900 (7d57a63) @@ -104,6 +104,8 @@ fi set -e +mkdir -p m4 + echo "Running libtoolize ..." $LIBTOOLIZE --force --copy echo "Running aclocal ..." Modified: configure.ac (+1 -0) =================================================================== --- configure.ac 2015-09-14 15:31:07 +0900 (f60b481) +++ configure.ac 2015-09-28 21:36:13 +0900 (b464737) @@ -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]) -------------- next part -------------- HTML����������������������������...Download