Kouhei Sutou
null+****@clear*****
Thu Aug 7 23:12:12 JST 2014
Kouhei Sutou 2014-08-07 23:12:12 +0900 (Thu, 07 Aug 2014) New Revision: ec1c256ccc143106cf92d0fe8271790e9519d293 https://github.com/groonga/groonga/commit/ec1c256ccc143106cf92d0fe8271790e9519d293 Message: onigmo: add wrap directory for --disable-mruby case Added files: vendor/onigmo/Makefile.am vendor/onigmo/configure Modified files: configure.ac Modified: configure.ac (+2 -1) =================================================================== --- configure.ac 2014-08-07 22:37:36 +0900 (4f2d3d9) +++ configure.ac 2014-08-07 23:12:12 +0900 (006189b) @@ -292,6 +292,7 @@ AC_CONFIG_FILES([ benchmark/fixtures/geo-select/Makefile benchmark/lib/Makefile vendor/Makefile + vendor/onigmo/Makefile vendor/mruby/Makefile ]) @@ -1349,7 +1350,7 @@ if test "$enable_mruby" = "yes"; then MRUBY_CFLAGS="-I\$(top_srcdir)/vendor/mruby-source/include" MRUBY_LIBS="\$(top_builddir)/vendor/mruby/libmruby.la" MRUBY_LIBS="${MRUBY_LIBS} \$(top_builddir)/vendor/onigmo-source/libonig.la" - AC_CONFIG_SUBDIRS([vendor/onigmo-source]) + AC_CONFIG_SUBDIRS([vendor/onigmo]) else MRUBY_CFLAGS= MRUBY_LIBS= Added: vendor/onigmo/Makefile.am (+16 -0) 100644 =================================================================== --- /dev/null +++ vendor/onigmo/Makefile.am 2014-08-07 23:12:12 +0900 (238f45d) @@ -0,0 +1,16 @@ +ALL_DEPENDENCIES = +CLEAN_DEPENDENCIES = +if WITH_MRUBY +ALL_DEPENDENCIES += onigmo-all +CLEAN_DEPENDENCIES += onigmo-clean +endif + +onigmo-all: + cd ../onigmo-source && $(MAKE) all + +all: $(ALL_DEPENDENCIES) + +onigmo-clean: + cd ../onigmo-source && $(MAKE) clean + +clean: $(CLEAN_DEPENDENCIES) Added: vendor/onigmo/configure (+36 -0) 100755 =================================================================== --- /dev/null +++ vendor/onigmo/configure 2014-08-07 23:12:12 +0900 (202808b) @@ -0,0 +1,36 @@ +#!/bin/sh + +set -e +set -u + +srcdir="." +builddir="." +for argument in "$@"; do + case "$argument" in + --srcdir=*) + srcdir="$(echo "${argument}" | sed -e 's/--srcdir=//')" + ;; + esac +done + +top_srcdir="${srcdir}/../.." +top_builddir="${builddir}/../.." + +abs_top_srcdir="$(cd "${top_srcdir}" && pwd)" +abs_top_builddir="$(cd "${top_builddir}" && pwd)" + +relative_onigmo_directory="vendor/onigmo-source" +onigmo_directory="${top_srcdir}/${relative_onigmo_directory}" + +onigmo_directory_in_build_directory="${abs_top_builddir}/${relative_onigmo_directory}" +if [ "${abs_top_srcdir}/vendor/onigmo" != "$(pwd)" ]; then + mkdir -p "${onigmo_directory_in_build_directory}" + rm -rf "${onigmo_directory_in_build_directory}" + cp -rp \ + "${abs_top_srcdir}/${relative_onigmo_directory}" \ + "${onigmo_directory_in_build_directory}" +fi + +cd "${onigmo_directory_in_build_directory}" + +./configure "$@" -------------- next part -------------- HTML����������������������������...Télécharger
