null+****@clear*****
null+****@clear*****
2012年 6月 21日 (木) 16:12:12 JST
Ryo Onodera 2012-06-21 16:12:12 +0900 (Thu, 21 Jun 2012) New Revision: 5c50bcdb63df3efd3cb19926f830d1c41bc3d6e4 https://github.com/groonga/groonga/commit/5c50bcdb63df3efd3cb19926f830d1c41bc3d6e4 Log: httpd: don't use pkg-config when building nginx in tree Modified files: configure.ac groonga-httpd-conf.sh.in groonga.pc.in src/nginx-module/config Modified: configure.ac (+6 -0) =================================================================== --- configure.ac 2012-06-21 16:02:07 +0900 (dac9c9a) +++ configure.ac 2012-06-21 16:12:12 +0900 (ca8ea25) @@ -1193,6 +1193,12 @@ 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-httpd-conf.sh.in (+4 -3) =================================================================== --- groonga-httpd-conf.sh.in 2012-06-21 16:02:07 +0900 (7496c8e) +++ groonga-httpd-conf.sh.in 2012-06-21 16:12:12 +0900 (a2e1d85) @@ -7,10 +7,11 @@ pkgsysconfdir="@pkgsysconfdir@" localstatedir="@localstatedir@" export GROONGA_HTTPD_MODULE_PATH="@abs_top_builddir@/src/nginx-module" -export GROONGA_HTTPD_INCLUDE_PATH="@abs_top_builddir@/include" +export GROONGA_HTTPD_CFLAGS="@groonga_cflags" +export GROONGA_HTTPD_LIBS="@groonga_libs" export GROONGA_HTTPD_RPATH="${libdir}" -export GROONGA_HTTPD_LINK_PATH="@abs_top_builddir@/lib/.libs" -export GROONGA_HTTPD_PKG_CONFIG_PATH="@abs_top_builddir@" +export GROONGA_HTTPD_IN_TREE_INCLUDE_PATH="@abs_top_builddir@/include" +export GROONGA_HTTPD_IN_TREE_LINK_PATH="@abs_top_builddir@/lib/.libs" export GROONGA_HTTPD_PREFIX="${pkgsysconfdir}/httpd" export GROONGA_HTTPD_BIN_PATH="${bindir}/groonga-httpd" export GROONGA_HTTPD_CONF_PATH="${pkgsysconfdir}/httpd/groonga-httpd.conf" Modified: groonga.pc.in (+4 -2) =================================================================== --- groonga.pc.in 2012-06-21 16:02:07 +0900 (e1060ad) +++ groonga.pc.in 2012-06-21 16:12:12 +0900 (c79057f) @@ -9,9 +9,11 @@ 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: -L${libdir} -lgroonga -Cflags: -I${includedir}/groonga +Libs: ${groonga_libs} +Cflags: ${groonga_cflags} Modified: src/nginx-module/config (+2 -4) =================================================================== --- src/nginx-module/config 2012-06-21 16:02:07 +0900 (227330b) +++ src/nginx-module/config 2012-06-21 16:12:12 +0900 (544eb02) @@ -5,10 +5,8 @@ groonga_strip_switch() } if [ "$GROONGA_HTTPD_IN_TREE" = yes ]; then - export PKG_CONFIG_PATH="${GROONGA_HTTPD_PKG_CONFIG_PATH}" - - groonga_cflags="$(pkg-config --cflags groonga) -I ${GROONGA_HTTPD_INCLUDE_PATH}" - groonga_libs="$(pkg-config --libs groonga) -Wl,-rpath=${GROONGA_HTTPD_RPATH} -L ${GROONGA_HTTPD_LINK_PATH}" + groonga_cflags="${GROONGA_HTTPD_CFLAGS} -I ${GROONGA_HTTPD_IN_TREE_INCLUDE_PATH}" + groonga_libs="${GROONGA_HTTPED_LIBS} -Wl,-rpath=${GROONGA_HTTPD_RPATH} -L ${GROONGA_HTTPD_IN_TREE_LINK_PATH}" 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...下載
