[Groonga-commit] groonga/groonga at 454c06f [master] Suppress a libtoolize warning

Back to archive index

Kouhei Sutou null+****@clear*****
Wed Sep 2 14:31:39 JST 2015


Kouhei Sutou	2015-09-02 14:31:39 +0900 (Wed, 02 Sep 2015)

  New Revision: 454c06f3ce6b8f5c7f195dea80a189aa5d767ef3
  https://github.com/groonga/groonga/commit/454c06f3ce6b8f5c7f195dea80a189aa5d767ef3

  Message:
    Suppress a libtoolize warning
    
        Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac

  Modified files:
    .gitignore
    Makefile.am
    autogen.sh
    configure.ac

  Modified: .gitignore (+3 -3)
===================================================================
--- .gitignore    2015-09-02 14:07:57 +0900 (7002b2a)
+++ .gitignore    2015-09-02 14:31:39 +0900 (bc3a4eb)
@@ -14,7 +14,8 @@
 .gdb_history
 .libs
 *~
-aclocal.m4
+/m4/
+/aclocal.m4
 /autom4te.cache
 /compile
 /config.guess
@@ -29,9 +30,8 @@ aclocal.m4
 /depcomp
 /dist
 /install-sh
-/libtool*
+/libtool
 /ltmain.sh
-/lt*.m4
 /missing
 /test-driver
 /groonga.pc

  Modified: Makefile.am (+1 -1)
===================================================================
--- Makefile.am    2015-09-02 14:07:57 +0900 (6f760a5)
+++ Makefile.am    2015-09-02 14:31:39 +0900 (332ee89)
@@ -2,7 +2,7 @@
 
 LOCALES = ja
 
-ACLOCAL_AMFLAGS = ${ACLOCAL_ARGS} -I .
+ACLOCAL_AMFLAGS = ${ACLOCAL_ARGS} -I m4
 AUTOMAKE_OPTIONS = 1.9.6
 SUBDIRS =					\
 	build					\

  Modified: autogen.sh (+2 -0)
===================================================================
--- autogen.sh    2015-09-02 14:07:57 +0900 (36cd939)
+++ autogen.sh    2015-09-02 14:31:39 +0900 (48a09b6)
@@ -23,4 +23,6 @@ if [ ! -e vendor/mruby-source/.git ]; then
 fi
 git submodule update --init
 
+mkdir -p m4
+
 ${AUTORECONF:-autoreconf} --force --install "$@"

  Modified: configure.ac (+1 -0)
===================================================================
--- configure.ac    2015-09-02 14:07:57 +0900 (f9946cb)
+++ configure.ac    2015-09-02 14:31:39 +0900 (e8b93c7)
@@ -1,6 +1,7 @@
 AC_PREREQ(2.59)
 m4_define([groonga_version], m4_include(base_version))
 AC_INIT([groonga], groonga_version, [groonga �� razil.jp])
+AC_CONFIG_MACRO_DIR([m4])
 AM_CONFIG_HEADER(config.h)
 
 AM_INIT_AUTOMAKE([foreign tar-pax subdir-objects])
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index