Kouhei Sutou
null+****@clear*****
Wed Feb 10 15:47:12 JST 2016
Kouhei Sutou 2016-02-10 15:47:12 +0900 (Wed, 10 Feb 2016) New Revision: 642aebce0c60341127f99186bf00effd20099fcf https://github.com/groonga/groonga/commit/642aebce0c60341127f99186bf00effd20099fcf Message: Use ACLOCAL_PATH The recent libtoolize reports error when custom directory exists in ACLOCAL_AMFLAGS in Makefile.am. Modified files: Makefile.am autogen.sh Modified: Makefile.am (+1 -1) =================================================================== --- Makefile.am 2016-02-10 15:12:36 +0900 (9d8c221) +++ Makefile.am 2016-02-10 15:47:12 +0900 (db78011) @@ -2,7 +2,7 @@ LOCALES = ja -ACLOCAL_AMFLAGS = ${ACLOCAL_ARGS} -I m4 +ACLOCAL_AMFLAGS = -I m4 AUTOMAKE_OPTIONS = 1.9.6 SUBDIRS = \ build \ Modified: autogen.sh (+3 -3) =================================================================== --- autogen.sh 2016-02-10 15:12:36 +0900 (0c409f7) +++ autogen.sh 2016-02-10 15:47:12 +0900 (d7c201e) @@ -6,7 +6,7 @@ case `uname -s` in Darwin) homebrew_aclocal=/usr/local/share/aclocal if [ -d $homebrew_aclocal ]; then - ACLOCAL_ARGS="$ACLOCAL_ARGS -I $homebrew_aclocal" + ACLOCAL_PATH="$ACLOCAL_PATH $homebrew_aclocal" fi gettext_prefix=/usr/local/Cellar/gettext if [ -d $gettext_prefix ]; then @@ -14,12 +14,12 @@ Darwin) sort --version-sort | \ tail -n 1) if [ -d $gettext_aclocal ]; then - ACLOCAL_ARGS="$ACLOCAL_ARGS -I $gettext_aclocal" + ACLOCAL_PATH="$ACLOCAL_PATH $gettext_aclocal" fi fi ;; FreeBSD) - ACLOCAL_ARGS="$ACLOCAL_ARGS -I /usr/local/share/aclocal/" + ACLOCAL_PATH="$ACLOCAL_PATH /usr/local/share/aclocal/" ;; esac -------------- next part -------------- HTML����������������������������...Download