[Groonga-commit] groonga/groonga at 3a93a64 [master] groonga-httpd: show error details on groonga-httpd configure error

Back to archive index

Kouhei Sutou null+****@clear*****
Sat Aug 29 21:12:59 JST 2015


Kouhei Sutou	2015-08-29 21:12:59 +0900 (Sat, 29 Aug 2015)

  New Revision: 3a93a6402b6c21c72ed9c8d8ca7aa64b51443384
  https://github.com/groonga/groonga/commit/3a93a6402b6c21c72ed9c8d8ca7aa64b51443384

  Message:
    groonga-httpd: show error details on groonga-httpd configure error

  Modified files:
    src/httpd/configure

  Modified: src/httpd/configure (+9 -1)
===================================================================
--- src/httpd/configure    2015-08-29 20:54:47 +0900 (9e994f0)
+++ src/httpd/configure    2015-08-29 21:12:59 +0900 (71208ae)
@@ -31,7 +31,6 @@ relative_nginx_directory="vendor/nginx-${nginx_version}"
 nginx_directory="${top_srcdir}/${relative_nginx_directory}"
 
 export GROONGA_HTTPD_IN_TREE=yes
-cat "${top_builddir}/groonga-httpd-conf.sh"
 . "${top_builddir}/groonga-httpd-conf.sh"
 
 eval "$(${top_builddir}/libtool --config)"
@@ -83,6 +82,7 @@ fi
 
 cd "${nginx_directory_in_build_directory}"
 
+set +e
 auto/configure \
   --prefix="${GROONGA_HTTPD_PREFIX}" \
   --sbin-path="${GROONGA_HTTPD_BIN_PATH}" \
@@ -95,6 +95,14 @@ auto/configure \
   --with-ld-opt="${ld_opt}" \
   --with-http_stub_status_module \
   ${configure_args}
+exit_code=$?
+set -e
+
+if [ ${exit_code} -ne 0 ]; then
+  echo "Failed to configure groonga-httpd. Details:"
+  cat objs/autoconf.err
+  exit ${exit_code}
+fi
 
 if [ "${GROONGA_HTTPD_DEBUG}" = "yes" ]; then
   objs_makefile_backup="objs/Makefile.with-debug-flags"
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index