null+****@clear*****
null+****@clear*****
2012年 4月 13日 (金) 17:46:42 JST
Kouhei Sutou 2012-04-13 17:46:42 +0900 (Fri, 13 Apr 2012)
New Revision: cfac76a0732be8d18ca53b5ea5dc63df6cc4eeeb
Log:
cofnigure: use WITH_ prefix for package instead of HAVE_
Modified files:
configure.ac
lib/ctx.c
lib/ctx_impl.h
lib/output.c
lib/proc.c
src/groonga.c
Modified: configure.ac (+4 -4)
===================================================================
--- configure.ac 2012-04-13 17:37:17 +0900 (80fa398)
+++ configure.ac 2012-04-13 17:46:42 +0900 (fb58265)
@@ -745,7 +745,7 @@ if test "x$enable_libedit" != "xno"; then
],
[libedit_available=no])
if test "x$libedit_available" = "xyes"; then
- AC_DEFINE(HAVE_LIBEDIT, [1], [Use libedit with multibyte support.])
+ AC_DEFINE(WITH_LIBEDIT, [1], [Use libedit with multibyte support.])
else
if test "x$enable_editline" = "xyes"; then
AC_MSG_ERROR("No libedit found")
@@ -884,7 +884,7 @@ if test "x$enable_zeromq" != "xno"; then
],
[zeromq_available=no])
if test "x$zeromq_available" = "xyes"; then
- AC_DEFINE(HAVE_ZEROMQ, [1], [Define to 1 if ZeroMQ is available.])
+ AC_DEFINE(WITH_ZEROMQ, [1], [Define to 1 if ZeroMQ is available.])
else
if test "x$enable_zeromq" = "xyes"; then
AC_MSG_ERROR("No ZeroMQ found")
@@ -930,7 +930,7 @@ if test "x$with_libevent" != "xno"; then
LDFLAGS="$_SAVE_LDFLAGS"
LIBS="$_SAVE_LIBS"
if test "$libevent_available" = "yes"; then
- AC_DEFINE(HAVE_LIBEVENT, [1], [Define to 1 if libevent is available.])
+ AC_DEFINE(WITH_LIBEVENT, [1], [Define to 1 if libevent is available.])
LIBEVENT_CFLAGS="$libevent_cflags"
LIBEVENT_LIBS="$libevent_ldflags"
else
@@ -961,7 +961,7 @@ if test "x$with_message_pack" != "xno"; then
LDFLAGS="$_SAVE_LDFLAGS"
LIBS="$_SAVE_LIBS"
if test "x$message_pack_available" = "xyes"; then
- AC_DEFINE(HAVE_MESSAGE_PACK, [1], [Define to 1 if MessagePack is available.])
+ AC_DEFINE(WITH_MESSAGE_PACK, [1], [Define to 1 if MessagePack is available.])
MESSAGE_PACK_CFLAGS="-I$with_message_pack/include"
MESSAGE_PACK_LIBS="-L$with_message_pack/lib -lmsgpack"
else
Modified: lib/ctx.c (+3 -3)
===================================================================
--- lib/ctx.c 2012-04-13 17:37:17 +0900 (c996807)
+++ lib/ctx.c 2012-04-13 17:46:42 +0900 (dc087b8)
@@ -391,7 +391,7 @@ grn_ctx_loader_clear(grn_ctx *ctx)
#define IMPL_SIZE ((sizeof(struct _grn_ctx_impl) + (grn_pagesize - 1)) & ~(grn_pagesize - 1))
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
static inline int
grn_msgpack_buffer_write(void *data, const char *buf, unsigned int len)
{
@@ -479,7 +479,7 @@ grn_ctx_impl_init(grn_ctx *ctx)
grn_loader_init(&ctx->impl->loader);
ctx->impl->plugin_path = NULL;
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_packer_init(&ctx->impl->msgpacker, ctx, grn_msgpack_buffer_write);
#endif
}
@@ -1080,7 +1080,7 @@ get_content_mime_type(grn_ctx *ctx, const char *p, const char *pe)
ctx->impl->mime_type = "image/jpeg";
}
break;
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
case 'm' :
if (p + 7 == pe && !memcmp(p, "msgpack", 7)) {
ctx->impl->output_type = GRN_CONTENT_MSGPACK;
Modified: lib/ctx_impl.h (+2 -2)
===================================================================
--- lib/ctx_impl.h 2012-04-13 17:37:17 +0900 (8f14619)
+++ lib/ctx_impl.h 2012-04-13 17:46:42 +0900 (03ce5b5)
@@ -26,7 +26,7 @@
#include "com.h"
#endif /* GRN_COM_H */
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
#include <msgpack.h>
#endif
@@ -165,7 +165,7 @@ struct _grn_ctx_impl {
uint64_t u64;
} data;
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_packer msgpacker;
#endif
};
Modified: lib/output.c (+12 -12)
===================================================================
--- lib/output.c 2012-04-13 17:37:17 +0900 (35a67c6)
+++ lib/output.c 2012-04-13 17:46:42 +0900 (5728e14)
@@ -79,7 +79,7 @@ grn_output_array_open(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_typ
if (DEPTH > 2) { GRN_TEXT_PUTS(ctx, outbuf, "[\t"); }
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
if (nelements < 0) {
GRN_LOG(ctx, GRN_LOG_DEBUG,
"grn_output_array_open nelements (%d) for <%s>",
@@ -146,7 +146,7 @@ grn_output_map_open(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
if (DEPTH > 2) { GRN_TEXT_PUTS(ctx, outbuf, "{\t"); }
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
if (nelements < 0) {
GRN_LOG(ctx, GRN_LOG_DEBUG,
"grn_output_map_open nelements (%d) for <%s>",
@@ -211,7 +211,7 @@ grn_output_int32(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, in
GRN_TEXT_PUTS(ctx, outbuf, "</INT>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_pack_int32(&ctx->impl->msgpacker, value);
#endif
break;
@@ -238,7 +238,7 @@ grn_output_int64(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, in
GRN_TEXT_PUTS(ctx, outbuf, "</INT>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_pack_int64(&ctx->impl->msgpacker, value);
#endif
break;
@@ -265,7 +265,7 @@ grn_output_uint64(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, i
GRN_TEXT_PUTS(ctx, outbuf, "</INT>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_pack_uint64(&ctx->impl->msgpacker, value);
#endif
break;
@@ -292,7 +292,7 @@ grn_output_float(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, do
GRN_TEXT_PUTS(ctx, outbuf, "</FLOAT>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_pack_double(&ctx->impl->msgpacker, value);
#endif
break;
@@ -320,7 +320,7 @@ grn_output_str(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
GRN_TEXT_PUTS(ctx, outbuf, "</TEXT>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_pack_raw(&ctx->impl->msgpacker, value_len);
msgpack_pack_raw_body(&ctx->impl->msgpacker, value, value_len);
#endif
@@ -355,7 +355,7 @@ grn_output_bool(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, cha
GRN_TEXT_PUTS(ctx, outbuf, "</BOOL>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
if (value) {
msgpack_pack_true(&ctx->impl->msgpacker);
} else {
@@ -385,7 +385,7 @@ grn_output_void(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
GRN_TEXT_PUTS(ctx, outbuf, "<NULL/>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_pack_nil(&ctx->impl->msgpacker);
#endif
break;
@@ -417,7 +417,7 @@ grn_output_time(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type, int
GRN_TEXT_PUTS(ctx, outbuf, "</DATE>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
msgpack_pack_double(&ctx->impl->msgpacker, dv);
#endif
break;
@@ -465,7 +465,7 @@ grn_output_geo_point(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type
GRN_TEXT_PUTS(ctx, outbuf, "</GEO_POINT>");
break;
case GRN_CONTENT_MSGPACK :
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
if (value) {
grn_obj buf;
GRN_TEXT_INIT(&buf, 0);
@@ -950,7 +950,7 @@ grn_output_obj(grn_ctx *ctx, grn_obj *outbuf, grn_content_type output_type,
GRN_CURSOR_ASCENDING);
int resultset_size = -1;
if (!tc) { ERRCLR(ctx); }
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
resultset_size = 1; /* [NHITS, (COLUMNS), (HITS)] */
if (format->flags & GRN_OBJ_FORMAT_WITH_COLUMN_NAMES) {
resultset_size++;
Modified: lib/proc.c (+2 -2)
===================================================================
--- lib/proc.c 2012-04-13 17:37:17 +0900 (df72857)
+++ lib/proc.c 2012-04-13 17:46:42 +0900 (bb72d7d)
@@ -1188,7 +1188,7 @@ proc_column_list(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_da
grn_hash *cols;
grn_obj *col;
int column_list_size = -1;
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
column_list_size = 1; /* [header, (key), (COLUMNS)] */
if ((col = grn_obj_column(ctx, table, KEY_NAME, sizeof(KEY_NAME)-1))) {
column_list_size++;
@@ -1330,7 +1330,7 @@ proc_table_list(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_dat
grn_table_cursor *cur;
int table_list_length = -1;
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
if (ctx->impl->output_type == GRN_CONTENT_MSGPACK) {
table_list_length = 1; /* header */
if ((cur = grn_table_cursor_open(ctx, ctx->impl->db, NULL, 0, NULL, 0, 0, -1, 0))) {
Modified: src/groonga.c (+8 -8)
===================================================================
--- src/groonga.c 2012-04-13 17:37:17 +0900 (c80beac)
+++ src/groonga.c 2012-04-13 17:46:42 +0900 (0f75e53)
@@ -90,7 +90,7 @@ grn_rc_to_exit_code(grn_rc rc)
}
}
-#ifdef HAVE_LIBEDIT
+#ifdef WITH_LIBEDIT
#include <locale.h>
#include <histedit.h>
static EditLine *line_editor = NULL;
@@ -179,7 +179,7 @@ line_editor_fgets(grn_ctx *ctx, grn_obj *buf)
}
return rc;
}
-#endif /* HAVE_LIBEDIT */
+#endif /* WITH_LIBEDIT */
inline static grn_rc
prompt(grn_ctx *ctx, grn_obj *buf)
@@ -188,7 +188,7 @@ prompt(grn_ctx *ctx, grn_obj *buf)
grn_rc rc = GRN_SUCCESS;
GRN_BULK_REWIND(buf);
if (!batchmode) {
-#ifdef HAVE_LIBEDIT
+#ifdef WITH_LIBEDIT
rc = line_editor_fgets(ctx, buf);
#else
fprintf(stderr, "> ");
@@ -478,7 +478,7 @@ transform_xml(grn_ctx *ctx, grn_obj *output, grn_obj *transformed)
GRN_OBJ_FIN(ctx, &columns);
}
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
typedef struct {
grn_ctx *ctx;
grn_obj *buffer;
@@ -607,7 +607,7 @@ print_return_code(grn_ctx *ctx, grn_rc rc, grn_obj *head, grn_obj *body, grn_obj
}
break;
case GRN_CONTENT_MSGPACK:
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
{
msgpack_writer_ctx head_writer_ctx;
msgpack_packer header_packer;
@@ -2356,7 +2356,7 @@ show_version(void)
#ifdef WITH_MECAB
printf(",mecab");
#endif
-#ifdef HAVE_MESSAGE_PACK
+#ifdef WITH_MESSAGE_PACK
printf(",msgpack");
#endif
#ifndef NO_ZLIB
@@ -2776,7 +2776,7 @@ main(int argc, char **argv)
cache_limit = default_cache_limit;
}
-#ifdef HAVE_LIBEDIT
+#ifdef WITH_LIBEDIT
if (!batchmode) {
line_editor_init(argc, argv);
}
@@ -2830,7 +2830,7 @@ main(int argc, char **argv)
break;
}
-#ifdef HAVE_LIBEDIT
+#ifdef WITH_LIBEDIT
if (!batchmode) {
line_editor_fin();
}