null+****@clear*****
null+****@clear*****
2011年 9月 25日 (日) 10:42:21 JST
Kouhei Sutou 2011-09-25 01:42:21 +0000 (Sun, 25 Sep 2011)
New Revision: 7f0f53bb8372baed63551e12fec17f347ef98ed6
Log:
add --with-default-tokenizer configure option to specify the default tokenizer.
Modified files:
configure.ac
mrn_sys.c
mrn_sys.h
Modified: configure.ac (+13 -0)
===================================================================
--- configure.ac 2011-09-25 01:25:55 +0000 (02ab654)
+++ configure.ac 2011-09-25 01:42:21 +0000 (e1321f7)
@@ -167,6 +167,19 @@ AC_SUBST(plugindir)
CONFIG_OPTION_MECAB
CONFIG_OPTION_GROONGA
+AC_ARG_WITH(default_tokenizer,
+ [AC_HELP_STRING([--with-default-tokenizer=TOKENIZER],
+ [specify the default tokenizer like
+ --with-default-tokenizer=TokenMecab.
+ (default: TokenBigram)])],
+ [default_tokenizer=$withval],
+ [default_tokenizer=no])
+if test x"$default_tokenizer" != x"no"; then
+ AC_DEFINE_UNQUOTED(MRN_TOKENIZER_DEFAULT,
+ "$default_tokenizer",
+ "specified default tokenizer")
+fi
+
# check Cutter with GLib support if available
REQUIRED_MINIMUM_CUTTER_VERSION=1.1.3
m4_ifdef([AC_CHECK_GCUTTER], [
Modified: mrn_sys.c (+4 -1)
===================================================================
--- mrn_sys.c 2011-09-25 01:25:55 +0000 (b0fae90)
+++ mrn_sys.c 2011-09-25 01:42:21 +0000 (934634b)
@@ -18,11 +18,14 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "mrn_sys.h"
-#include "config.h"
int mrn_hash_put(grn_ctx *ctx, grn_hash *hash, const char *key, void *value)
{
Modified: mrn_sys.h (+3 -1)
===================================================================
--- mrn_sys.h 2011-09-25 01:25:55 +0000 (5e5d129)
+++ mrn_sys.h 2011-09-25 01:42:21 +0000 (b9112b9)
@@ -36,7 +36,9 @@
#define MRN_PAT_SUFFIX "_pat"
#define MRN_COLUMN_NAME_ID "_id"
#define MRN_COLUMN_NAME_SCORE "_score"
-#define MRN_TOKENIZER_DEFAULT "TokenBigram"
+#ifndef MRN_TOKENIZER_DEFAULT
+# define MRN_TOKENIZER_DEFAULT "TokenBigram"
+#endif
/* functions */
int mrn_hash_put(grn_ctx *ctx, grn_hash *hash, const char *key, void *value);