Index: configure
--- configure.orig	2020-09-30 02:30:43.000000000 +0200
+++ configure	2020-09-30 09:02:59.218284000 +0200
@@ -4819,9 +4819,9 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-O2"
   else
-    CFLAGS="-g"
+    CFLAGS=""
   fi
 else
   if test "$GCC" = yes; then
@@ -5975,9 +5975,9 @@
   CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
+    CXXFLAGS="-O2"
   else
-    CXXFLAGS="-g"
+    CXXFLAGS=""
   fi
 else
   if test "$GXX" = yes; then
@@ -7214,9 +7214,9 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-O2"
   else
-    CFLAGS="-g"
+    CFLAGS=""
   fi
 else
   if test "$GCC" = yes; then
@@ -7831,7 +7831,7 @@
 NO_STRICT_ALIASING_CFLAGS=""
 NO_FLOAT_EQUAL_CFLAGS=""
 NO_BAD_FUNCTION_CAST_CFLAGS=""
-if test "$GCC" = "yes"; then
+if false; then
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc supports -Wall" >&5
Index: lib/ii.c
--- lib/ii.c.orig	2020-09-29 09:16:08.000000000 +0200
+++ lib/ii.c	2020-09-30 09:05:21.643346000 +0200
@@ -2468,7 +2468,7 @@
           "<%" GRN_FMT_SIZE ">",
           context,
           POS_LOFFSET_HEADER);
-      return false;
+      return GRN_FALSE;
     }
     if ((POS_LOFFSET_TERM % 4) != 0) {
       ERR(GRN_OPERATION_NOT_SUPPORTED,
@@ -2476,10 +2476,10 @@
           "<%" GRN_FMT_SIZE ">",
           context,
           POS_LOFFSET_TERM);
-      return false;
+      return GRN_FALSE;
     }
   }
-  return true;
+  return GRN_TRUE;
 }
 
 #define POS_IS_EMBED(pos) ((pos) & 1)
@@ -4882,11 +4882,11 @@
         buffer_merge(ctx, ii, lseg, h, sb, sc, db, &dc, &merging_data);
         if (ctx->rc == GRN_SUCCESS) {
           const uint32_t actual_chunk_size = db->header.chunk_size;
-          bool need_chunk_free = true;
+          grn_bool need_chunk_free = GRN_TRUE;
           if (actual_chunk_size > 0) {
             chunk_new(ctx, ii, &dcn, actual_chunk_size);
             if (ctx->rc == GRN_SUCCESS) {
-              need_chunk_free = true;
+              need_chunk_free = GRN_TRUE;
             }
           }
           if (ctx->rc == GRN_SUCCESS) {
@@ -4899,8 +4899,8 @@
               dc = NULL;
               buffer_segment_update(ii, lseg, ds);
               ii->header.common->total_chunk_size += actual_chunk_size;
-              need_chunk_free = false;
-              merging_data.succeeded = true;
+              need_chunk_free = GRN_FALSE;
+              merging_data.succeeded = GRN_TRUE;
               if (scn != GRN_II_PSEG_NOT_ASSIGNED) {
                 chunk_free(ctx, ii, scn, sb->header.chunk_size);
                 ii->header.common->total_chunk_size -= sb->header.chunk_size;
@@ -5284,11 +5284,11 @@
           buffer_merge(ctx, ii, lseg, h, sb, sc, db0, &dc0, &merging_data);
           if (ctx->rc == GRN_SUCCESS) {
             const uint32_t actual_db0_chunk_size = db0->header.chunk_size;
-            bool need_db0_chunk_free = false;
+            grn_bool need_db0_chunk_free = GRN_FALSE;
             if (actual_db0_chunk_size > 0) {
               chunk_new(ctx, ii, &dcn0, actual_db0_chunk_size);
               if (ctx->rc == GRN_SUCCESS) {
-                need_db0_chunk_free = true;
+                need_db0_chunk_free = GRN_TRUE;
               }
             }
             if (ctx->rc == GRN_SUCCESS) {
@@ -5303,11 +5303,11 @@
                 buffer_merge(ctx, ii, lseg, h, sb, sc, db1, &dc1, &merging_data);
                 if (ctx->rc == GRN_SUCCESS) {
                   const uint32_t actual_db1_chunk_size = db1->header.chunk_size;
-                  bool need_db1_chunk_free = false;
+                  grn_bool need_db1_chunk_free = GRN_FALSE;
                   if (actual_db1_chunk_size > 0) {
                     chunk_new(ctx, ii, &dcn1, actual_db1_chunk_size);
                     if (ctx->rc == GRN_SUCCESS) {
-                      need_db1_chunk_free = true;
+                      need_db1_chunk_free = GRN_TRUE;
                     }
                   }
                   if (ctx->rc == GRN_SUCCESS) {
@@ -5328,9 +5328,9 @@
                       ii->header.common->total_chunk_size +=
                         actual_db0_chunk_size +
                         actual_db1_chunk_size;
-                      need_db0_chunk_free = false;
-                      need_db1_chunk_free = false;
-                      merging_data.succeeded = true;
+                      need_db0_chunk_free = GRN_FALSE;
+                      need_db1_chunk_free = GRN_FALSE;
+                      merging_data.succeeded = GRN_TRUE;
                       if (scn != GRN_II_PSEG_NOT_ASSIGNED) {
                         chunk_free(ctx, ii, scn, sb->header.chunk_size);
                         ii->header.common->total_chunk_size -=
Index: src/Makefile.in
--- src/Makefile.in.orig	2020-09-30 02:30:45.000000000 +0200
+++ src/Makefile.in	2020-09-30 09:02:59.220541000 +0200
@@ -561,8 +561,9 @@
 
 nodist_EXTRA_groonga_SOURCES = $(NONEXISTENT_CXX_SOURCE)
 groonga_CFLAGS = $(AM_CFLAGS) $(LIBEDIT_CFLAGS)
-groonga_LDADD = \
+groonga_LDADD = -static \
 	$(top_builddir)/lib/libgroonga.la	\
+	$(top_builddir)/vendor/onigmo-source/libonigmo.la \
 	$(LIBEDIT_LIBS)				\
 	$(MESSAGE_PACK_LIBS)
 
@@ -570,16 +571,18 @@
 	grnslap.c
 
 nodist_EXTRA_grnslap_SOURCES = $(NONEXISTENT_CXX_SOURCE)
-grnslap_LDADD = \
+grnslap_LDADD = -static \
 	$(top_builddir)/lib/libgroonga.la	\
+	$(top_builddir)/vendor/onigmo-source/libonigmo.la \
 	$(MESSAGE_PACK_LIBS)
 
 groonga_benchmark_SOURCES = \
 	groonga_benchmark.c
 
 nodist_EXTRA_groonga_benchmark_SOURCES = $(NONEXISTENT_CXX_SOURCE)
-groonga_benchmark_LDADD = \
+groonga_benchmark_LDADD = -static \
 	$(top_builddir)/lib/libgroonga.la	\
+	$(top_builddir)/vendor/onigmo-source/libonigmo.la \
 	$(MESSAGE_PACK_LIBS)
 
 grndb_SOURCES = \
Index: src/suggest/Makefile.in
--- src/suggest/Makefile.in.orig	2020-09-30 02:30:45.000000000 +0200
+++ src/suggest/Makefile.in	2020-09-30 09:02:59.220739000 +0200
@@ -561,8 +561,9 @@
 groonga_suggest_create_dataset_CFLAGS = \
 	$(AM_CFLAGS)
 
-groonga_suggest_create_dataset_LDADD = \
-	$(top_builddir)/lib/libgroonga.la
+groonga_suggest_create_dataset_LDADD = -static \
+	$(top_builddir)/lib/libgroonga.la \
+	$(top_builddir)/vendor/onigmo-source/libonigmo.la
 
 libutil_la_SOURCES = \
 	util.c					\