Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:21:51 JST 2012
Kouhei Sutou 2010-09-13 19:25:13 +0900 (Mon, 13 Sep 2010) New Revision: 30724f71fca6de54ef87f57f36b07282d668455f https://github.com/mroonga/mroonga/commit/30724f71fca6de54ef87f57f36b07282d668455f Merged d09b14e: Merge branch 'master' of git �� github.com:mroonga/mroonga Log: use pkg-config for groonga. Modified files: Makefile.am configure.ac test/unit/Makefile.am Modified: Makefile.am (+1 -1) =================================================================== --- Makefile.am 2010-09-13 17:59:34 +0900 (7f5c93f) +++ Makefile.am 2010-09-13 19:25:13 +0900 (dcf7ba9) @@ -1,4 +1,4 @@ -AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_INCLUDES) $(MECAB_INCLUDES) +AM_CPPFLAGS = $(MYSQL_INC) $(GROONGA_CFLAGS) $(MECAB_INCLUDES) AM_INCLUDES = -l. -l.. ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS Modified: configure.ac (+1 -36) =================================================================== --- configure.ac 2010-09-13 17:59:34 +0900 (2b86abf) +++ configure.ac 2010-09-13 19:25:13 +0900 (54bfca4) @@ -124,42 +124,7 @@ AC_DEFUN([CONFIG_OPTION_MECAB],[ ]) AC_DEFUN([CONFIG_OPTION_GROONGA],[ - GROONGA_INCLUDES= - GROONGA_LIBS= - AC_MSG_CHECKING([groonga]) - AC_ARG_WITH([groonga], - [AS_HELP_STRING([--with-groonga=PATH],[groonga prefix PATH])], - [with_groonga=$withval],[with_groonga=yes]) - - if test "$with_groonga" = "no";then - AC_MSG_ERROR([groonga must not be disabled]); - elif test "$with_groonga" = "yes"; then - GROONGA_INCLUDES="`pkg-config --cflags groonga`" - GROONGA_LIBS="`pkg-config --libs groonga`" - elif test -d $with_groonga; then - PKG_CONFIG_PATH="$with_groonga/lib/pkgconfig:$PKG_CONFIG_PATH" - GROONGA_INCLUDES="`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --cflags groonga`" - GROONGA_LIBS="`PKG_CONFIG_PATH=$PKG_CONFIG_PATH pkg-config --libs groonga`" - else - AC_MSG_ERROR([argument doesn't exists: --with-groonga=$with_groonga]) - fi - AC_MSG_RESULT([yes]) - - _CPPFLAGS="${CPPFLAGS}" - _LIBS="${LIBS}" - CPPFLAGS="${CPPFLAGS} ${GROONGA_INCLUDES}" - LIBS="${LIBS} ${GROONGA_LIBS}" - - AC_CHECK_FUNC(grn_init, [AC_DEFINE([ENABLE_GROONGA], [1], - [Define to 1 if Groonga is enabled])], - [AC_MSG_ERROR([Could not find libgroonga. Check your Groonga installation.]) - ]) - - CPPFLAGS="${_CPPFLAGS}" - LIBS="${_LIBS}" - - AC_SUBST([GROONGA_INCLUDES]) - AC_SUBST([GROONGA_LIBS]) + PKG_CHECK_MODULES(GROONGA, groonga) ]) AC_ARG_WITH(debug, Modified: test/unit/Makefile.am (+1 -1) =================================================================== --- test/unit/Makefile.am 2010-09-13 17:59:34 +0900 (7a5b00c) +++ test/unit/Makefile.am 2010-09-13 19:25:13 +0900 (9d678e0) @@ -2,7 +2,7 @@ if WITH_CUTTER noinst_LTLIBRARIES = test_mrnsys.la endif -AM_CPPFLAGS = $(GROONGA_INCLUDES) $(MECAB_INCLUDES) $(CUTTER_CFLAGS) $(GCUTTER_CFLAGS) +AM_CPPFLAGS = $(GROONGA_CFLAGS) $(MECAB_INCLUDES) $(CUTTER_CFLAGS) $(GCUTTER_CFLAGS) AM_INCLUDES = -l. -l.. ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS -------------- next part -------------- HTML����������������������������...Download