Kouhei Sutou
null+****@clear*****
Sat Aug 9 18:56:34 JST 2014
Kouhei Sutou 2014-08-09 18:56:34 +0900 (Sat, 09 Aug 2014) New Revision: 960de1ccfea8428e2862b38a23bbc57d9ad450a9 https://github.com/groonga/groonga/commit/960de1ccfea8428e2862b38a23bbc57d9ad450a9 Message: Simplify autogen Modified files: Makefile.am autogen.sh configure.ac Modified: Makefile.am (+1 -1) =================================================================== --- Makefile.am 2014-08-09 18:46:05 +0900 (e0d1a6f) +++ Makefile.am 2014-08-09 18:56:34 +0900 (d817c5d) @@ -2,7 +2,7 @@ LOCALES = ja -ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS -I . +ACLOCAL_AMFLAGS = ${ACLOCAL_ARGS} -I . AUTOMAKE_OPTIONS = 1.9.6 SUBDIRS = \ build \ Modified: autogen.sh (+2 -105) =================================================================== --- autogen.sh 2014-08-09 18:46:05 +0900 (de204ef) +++ autogen.sh 2014-08-09 18:56:34 +0900 (9b3a98e) @@ -1,16 +1,6 @@ #!/bin/sh -warn() { - echo "\tWARNING: $@" 1>&2 -} - -# init - -LIBTOOLIZE=libtoolize -ACLOCAL=aclocal -AUTOCONF=autoconf -AUTOHEADER=autoheader -AUTOMAKE=automake +./version-gen.sh case `uname -s` in Darwin) @@ -22,103 +12,10 @@ Darwin) if [ -d $gettext_aclocal ]; then ACLOCAL_ARGS="$ACLOCAL_ARGS -I $gettext_aclocal" fi - LIBTOOLIZE=glibtoolize ;; FreeBSD) ACLOCAL_ARGS="$ACLOCAL_ARGS -I /usr/local/share/aclocal/" ;; esac -# generate version number. -./version-gen.sh - -# libtoolize -echo "Searching libtoolize..." -if [ `which $LIBTOOLIZE` ] ; then - echo "\tFOUND: libtoolize -> $LIBTOOLIZE" -else - warn "Cannot Found libtoolize... input libtool command" - read LIBTOOLIZE - LIBTOOLIZE=`which $LIBTOOLIZE` - if [ `which $LIBTOOLIZE` ] ; then - echo "\tSET: libtoolize -> $LIBTOOLIZE" - else - warn "$LIBTOOLIZE: Command not found." - exit 1; - fi -fi - -# aclocal -echo "Searching aclocal..." -if [ `which $ACLOCAL` ] ; then - echo "\tFOUND: aclocal -> $ACLOCAL" -else - warn "Cannot Found aclocal... input aclocal command" - read ACLOCAL - ACLOCAL=`which $ACLOCAL` - if [ `which $ACLOCAL` ] ; then - echo "\tSET: aclocal -> $ACLOCAL" - else - warn "$ACLOCAL: Command not found." - exit 1; - fi -fi - -# automake -echo "Searching automake..." -if [ `which $AUTOMAKE` ] ; then - echo "\tFOUND: automake -> $AUTOMAKE" -else - warn "Cannot Found automake... input automake command" - read AUTOMAKE - ACLOCAL=`which $AUTOMAKE` - if [ `which $AUTOMAKE` ] ; then - echo "\tSET: automake -> $AUTOMAKE" - else - warn "$AUTOMAKE: Command not found." - exit 1; - fi -fi - -# autoheader -echo "Searching autoheader..." -if [ `which $AUTOHEADER` ] ; then - echo "\tFOUND: autoheader -> $AUTOHEADER" -else - warn "Cannot Found autoheader... input autoheader command" - read AUTOHEADER - ACLOCAL=`which $AUTOHEADER` - if [ `which $AUTOHEADER` ] ; then - echo "\tSET: autoheader -> $AUTOHEADER" - else - warn "$AUTOHEADER: Command not found." - exit 1; - fi -fi - -# autoconf -echo "Searching autoconf..." -if [ `which $AUTOCONF` ] ; then - echo "\tFOUND: autoconf -> $AUTOCONF" -else - warn "Cannot Found autoconf... input autoconf command" - read AUTOCONF - ACLOCAL=`which $AUTOCONF` - if [ `which $AUTOCONF` ] ; then - echo "\tSET: autoconf -> $AUTOCONF" - else - warn "$AUTOCONF: Command not found." - exit 1; - fi -fi - -echo "Running aclocal ..." -$ACLOCAL ${ACLOCAL_ARGS} -I . -echo "Running libtoolize ..." -$LIBTOOLIZE --force --copy -echo "Running autoheader..." -$AUTOHEADER -echo "Running automake ..." -$AUTOMAKE --add-missing --copy -echo "Running autoconf ..." -$AUTOCONF +${AUTORECONF:-autoreconf} --force --install Modified: configure.ac (+1 -1) =================================================================== --- configure.ac 2014-08-09 18:46:05 +0900 (006189b) +++ configure.ac 2014-08-09 18:56:34 +0900 (9a07e41) @@ -3,7 +3,7 @@ m4_define([groonga_version], m4_include(base_version)) AC_INIT([groonga], groonga_version, [groonga �� razil.jp]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([tar-pax subdir-objects]) +AM_INIT_AUTOMAKE([foreign tar-pax subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) PACKAGE_TITLE=Groonga -------------- next part -------------- HTML����������������������������...Download
