null+****@clear*****
null+****@clear*****
2012年 7月 1日 (日) 17:39:41 JST
Kouhei Sutou 2012-07-01 17:39:41 +0900 (Sun, 01 Jul 2012) New Revision: 97807e9ad86be231d4c5589f17e8b8e5bfc63011 https://github.com/groonga/groonga/commit/97807e9ad86be231d4c5589f17e8b8e5bfc63011 Log: Stop to share '-lgroonga' in nginx config and pc '-lgroonga' is an external API. So it will not be changed easily. When we add variables for groonga.pc.in, we need to set them in configure.ac and CMakeLists.txt. It's difficult to maintain. So we choose '-lgroonga' literal rather than new variables in groogna.pc.in. Modified files: configure.ac groonga.pc.in src/nginx-module/config Modified: configure.ac (+0 -6) =================================================================== --- configure.ac 2012-07-01 17:26:47 +0900 (c50669f) +++ configure.ac 2012-07-01 17:39:41 +0900 (ec24b35) @@ -1194,12 +1194,6 @@ GROONGA_HTTPD_DOCUMENT_ROOT="` `" AC_SUBST(GROONGA_HTTPD_DOCUMENT_ROOT) -groonga_libs="-L\${libdir} -lgroonga" -AC_SUBST(groonga_libs) - -groonga_cflags="-I\${includedir}/groonga" -AC_SUBST(groonga_cflags) - AC_OUTPUT([ packages/rpm/centos/groonga.spec packages/rpm/fedora/groonga.spec Modified: groonga.pc.in (+2 -4) =================================================================== --- groonga.pc.in 2012-07-01 17:26:47 +0900 (c79057f) +++ groonga.pc.in 2012-07-01 17:39:41 +0900 (e1060ad) @@ -9,11 +9,9 @@ document_root=@GRN_EXPANDED_DEFAULT_DOCUMENT_ROOT@ groonga=${bindir}/groonga ＠ EXEEXT@ groonga_suggest_create_dataset=${bindir}/groonga-suggest-create-dataset ＠ EXEEXT@ groonga_version=@GRN_VERSION@ -groonga_libs=@groonga_libs@ -groonga_cflags=@groonga_cflags@ Name: Groonga Description: An Embeddable Fulltext Search Engine Version: @VERSION@ -Libs: ${groonga_libs} -Cflags: ${groonga_cflags} +Libs: -L${libdir} -lgroonga +Cflags: -I${includedir}/groonga Modified: src/nginx-module/config (+1 -1) =================================================================== --- src/nginx-module/config 2012-07-01 17:26:47 +0900 (ca6fc9f) +++ src/nginx-module/config 2012-07-01 17:39:41 +0900 (bc35a87) @@ -6,7 +6,7 @@ groonga_strip_switch() if [ "$GROONGA_HTTPD_IN_TREE" = yes ]; then groonga_cflags="-I${GROONGA_HTTPD_IN_TREE_INCLUDE_PATH}" - groonga_libs="-L${GROONGA_HTTPD_IN_TREE_LINK_PATH} ${GROONGA_HTTPD_LIBS} -Wl,-rpath=${GROONGA_HTTPD_RPATH}" + groonga_libs="-L${GROONGA_HTTPD_IN_TREE_LINK_PATH} -lgroonga -Wl,-rpath=${GROONGA_HTTPD_RPATH}" ngx_addon_name=ngx_http_groonga_module HTTP_MODULES="$HTTP_MODULES ngx_http_groonga_module" -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download