Use "embedded" form

mroonga · Jun 20, 2015 · e4f3245 · e4f3245
1 parent a831ba4
commit e4f3245
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -390,13 +390,18 @@ if(GROONGA_NORMALIZER_MYSQL_FOUND)
     COMPILE_DEFINITIONS "WITH_GROONGA_NORMALIZER_MYSQL=1")
   if(MRN_GROONGA_NORMALIZER_MYSQL_EMBED)
     set_property(TARGET mroonga APPEND PROPERTY
-      COMPILE_DEFINITIONS "MRN_GROONGA_NORMALIZER_MYSQL_EMBED")
+      COMPILE_DEFINITIONS "MRN_GROONGA_NORMALIZER_MYSQL_EMBEDDED")
   else()
     set_property(TARGET mroonga APPEND PROPERTY
       COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME=\"normalizers/mysql\"")
   endif()
 endif()
 
+if(MRN_GROONGA_EMBED)
+  set_property(TARGET mroonga APPEND PROPERTY
+    COMPILE_DEFINITIONS "MRN_GROONGA_EMBEDDED")
+endif()
+
 set(MRN_DEFAULT_PARSER "" CACHE STRING
   "The default fulltext parser (Deprecated. Use MRN_DEFAULT_TOKENIZER instead.)")
 set(MRN_DEFAULT_TOKENIZER "" CACHE STRING

diff --git a/lib/mrn_database_manager.cpp b/lib/mrn_database_manager.cpp
@@ -312,7 +312,7 @@ namespace mrn {
     int error = 0;
 #ifdef WITH_GROONGA_NORMALIZER_MYSQL
     {
-#  ifdef MRN_GROONGA_NORMALIZER_MYSQL_EMBED
+#  ifdef MRN_GROONGA_NORMALIZER_MYSQL_EMBEDDED
       GRN_PLUGIN_IMPL_NAME_TAGGED(init, normalizers_mysql)(ctx_);
       GRN_PLUGIN_IMPL_NAME_TAGGED(register, normalizers_mysql)(ctx_);
 #  else