null+****@clear*****
null+****@clear*****
2010年 11月 16日 (火) 14:37:15 JST
Kouhei Sutou 2010-11-16 05:37:15 +0000 (Tue, 16 Nov 2010)
New Revision: b3b4039aa13ea84b792973943770da8289d47432
Log:
add GRN_* prefix.
Modified files:
configure.ac
src/Makefile.am
src/groonga.c
Modified: configure.ac (+1 -0)
===================================================================
--- configure.ac 2010-11-16 05:32:44 +0000 (c2dbdcb)
+++ configure.ac 2010-11-16 05:37:15 +0000 (99bf443)
@@ -705,6 +705,7 @@ GRN_DEFS=""
GRN_DEFS="$GRN_DEFS -DGRN_PLUGINS_DIR=\\\"\"\$(pluginsdir)\"\\\""
GRN_DEFS="$GRN_DEFS -DGRN_RELATIVE_PLUGINS_DIR=\\\"\"lib/\$(relative_pluginsdir)\"\\\""
GRN_DEFS="$GRN_DEFS -DGRN_LOG_PATH=\\\"\"\$(grn_log_path)\"\\\""
+GRN_DEFS="$GRN_DEFS -DGRN_DEFAULT_DOCUMENT_ROOT=\\\"\"\$(pkgdatadir)/admin_html\"\\\""
AC_SUBST(GRN_DEFS)
CFLAGS="$CFLAGS $OPT_CFLAGS "
LIBS="$LIBS $ZLIB_LIBS $LZO_LIBS $RT_LIBS $PTHREAD_LIBS $M_LIBS $NSL_LIBS $SOCKET_LIBS $WINDOWS_LIBS"
Modified: src/Makefile.am (+1 -1)
===================================================================
--- src/Makefile.am 2010-11-16 05:32:44 +0000 (6918be7)
+++ src/Makefile.am 2010-11-16 05:37:15 +0000 (9a29449)
@@ -2,7 +2,7 @@ bin_PROGRAMS = groonga grntest
noinst_PROGRAMS = grnslap
AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) $(GRN_CFLAGS)
-DEFS += $(GRN_CFLAGS) -DDEFAULT_DOCUMENT_ROOT=\"$(pkgdatadir)/admin_html\"
+DEFS += $(GRN_DEFS)
AM_LDFLAGS = -no-undefined
Modified: src/groonga.c (+1 -1)
===================================================================
--- src/groonga.c 2010-11-16 05:32:44 +0000 (c3d792c)
+++ src/groonga.c 2010-11-16 05:37:15 +0000 (82edfe8)
@@ -2194,7 +2194,7 @@ main(int argc, char **argv)
if (admin_html_path) {
grn_document_root = admin_html_path;
} else {
- grn_document_root = DEFAULT_DOCUMENT_ROOT;
+ grn_document_root = GRN_DEFAULT_DOCUMENT_ROOT;
}
}
if (protocol) {