Kouhei Sutou
null+****@clear*****
Wed Nov 1 09:54:04 JST 2017
Kouhei Sutou 2017-11-01 09:54:04 +0900 (Wed, 01 Nov 2017) New Revision: de7fc2d6848f1f9768758044d53172bbc8c90a5f https://github.com/groonga/groonga/commit/de7fc2d6848f1f9768758044d53172bbc8c90a5f Message: groonga-httpd: fix build error when old Groonga is already installed GitHub: fix #775 Reported by myamanishi3. Thanks!!! Modified files: src/httpd/configure src/httpd/nginx-module/config Modified: src/httpd/configure (+10 -2) =================================================================== --- src/httpd/configure 2017-10-31 18:02:53 +0900 (8ac4434a0) +++ src/httpd/configure 2017-11-01 09:54:04 +0900 (03888e4c3) @@ -69,8 +69,14 @@ if [ "${GROONGA_HTTPD_DEBUG}" = "yes" ]; then configure_args="${configure_args} --with-debug" fi -cc_opt="${CFLAGS-} ${CPPFLAGS-}" -ld_opt="${LDFLAGS-}" +groonga_cflags="-I${GROONGA_HTTPD_IN_TREE_INCLUDE_PATH}" +groonga_ldflags="-L${GROONGA_HTTPD_IN_TREE_LINK_PATH}" +if [ "${GROONGA_HTTPD_WITH_ONIGMO}" = "yes" ]; then + groonga_ldflags="$groonga_ldflags -L${GROONGA_HTTPD_ONIGMO_IN_TREE_LINK_PATH}" +fi + +cc_opt="${groonga_cflags}" +ld_opt="${groonga_ldflags}" if [ "${GROONGA_HTTPD_WITH_PCRE}" = "yes" ]; then cc_opt="${cc_opt} ${GROONGA_HTTPD_PCRE_CFLAGS}" ld_opt="${ld_opt} ${GROONGA_HTTPD_PCRE_LIBS_ONLY_L}" @@ -87,6 +93,8 @@ if [ "${GROONGA_HTTPD_WITH_SSL}" = "yes" ]; then ld_opt="${ld_opt} ${GROONGA_HTTPD_SSL_LIBS_ONLY_L}" configure_args="${configure_args} --with-http_ssl_module" fi +cc_opt="${cc_opt} ${CFLAGS-} ${CPPFLAGS-}" +ld_opt="${ld_opt} ${LDFLAGS-}" nginx_mruby_directory="${abs_top_srcdir}/vendor/ngx_mruby-source" mruby_directory="${abs_top_srcdir}/vendor/mruby-source" Modified: src/httpd/nginx-module/config (+5 -10) =================================================================== --- src/httpd/nginx-module/config 2017-10-31 18:02:53 +0900 (b79eef6ba) +++ src/httpd/nginx-module/config 2017-11-01 09:54:04 +0900 (d431a9ff6) @@ -7,23 +7,18 @@ groonga_strip_switch() } if [ "$GROONGA_HTTPD_IN_TREE" = yes ]; then - groonga_cflags="-I${GROONGA_HTTPD_IN_TREE_INCLUDE_PATH}" - groonga_cflags="${groonga_cflags} -DNGX_HTTP_GROONGA_LOG_PATH=\\\"\"${GROONGA_HTTPD_GROONGA_LOG_PATH}\"\\\"" + groonga_cflags="-DNGX_HTTP_GROONGA_LOG_PATH=\\\"\"${GROONGA_HTTPD_GROONGA_LOG_PATH}\"\\\"" groonga_cflags="${groonga_cflags} -DNGX_HTTP_GROONGA_QUERY_LOG_PATH=\\\"\"${GROONGA_HTTPD_GROONGA_QUERY_LOG_PATH}\"\\\"" - groonga_libs="-L${GROONGA_HTTPD_IN_TREE_LINK_PATH}" - if [ "${GROONGA_HTTPD_WITH_ONIGMO}" = "yes" ]; then - groonga_libs="$groonga_libs -L${GROONGA_HTTPD_ONIGMO_IN_TREE_LINK_PATH}" - fi - groonga_libs="$groonga_libs -lgroonga" + groonga_libs="-lgroonga" if [ -n "${GROONGA_HTTPD_RPATH}" ]; then - groonga_libs="$groonga_libs -Wl,-rpath -Wl,${GROONGA_HTTPD_RPATH}" + groonga_libs="${groonga_libs} -Wl,-rpath -Wl,${GROONGA_HTTPD_RPATH}" fi ngx_addon_name=ngx_http_groonga_module HTTP_MODULES="$HTTP_MODULES ngx_http_groonga_module" NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_groonga_module.c" - CFLAGS="$CFLAGS $groonga_cflags" - CORE_LIBS="$CORE_LIBS $groonga_libs" + CFLAGS="$CFLAGS ${groonga_cflags}" + CORE_LIBS="$CORE_LIBS ${groonga_libs}" return 0 fi -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171101/5f31b491/attachment-0001.htm
