[Groonga-commit] groonga/groonga at be52cec [master] Require OpenSSL 1.0.1e or later

Back to archive index

Kouhei Sutou null+****@clear*****
Sun Oct 9 23:56:47 JST 2016


Kouhei Sutou	2016-10-09 23:56:47 +0900 (Sun, 09 Oct 2016)

  New Revision: be52cecb8a8866d443ee79a2292b86e453f6e2e3
  https://github.com/groonga/groonga/commit/be52cecb8a8866d443ee79a2292b86e453f6e2e3

  Message:
    Require OpenSSL 1.0.1e or later
    
    Because system OpenSSL on OS X is 0.9.8zh.
    
    1.0.1e is the version provided on CentOS 6.

  Modified files:
    configure.ac
    tools/travis-install.sh

  Modified: configure.ac (+1 -1)
===================================================================
--- configure.ac    2016-10-09 23:22:32 +0900 (2c6fc15)
+++ configure.ac    2016-10-09 23:56:47 +0900 (13edbbf)
@@ -1619,7 +1619,7 @@ AC_ARG_WITH(ssl,
   [with_ssl="auto"])
 if test "x$with_ssl" != "xno"; then
   m4_ifdef([PKG_CHECK_MODULES], [
-    PKG_CHECK_MODULES([SSL], [libssl],
+    PKG_CHECK_MODULES([SSL], [libssl >= 1.0.1e],
       [_PKG_CONFIG(SSL_LIBS_ONLY_L, [libs-only-L], [libssl])
        SSL_LIBS_ONLY_L="$pkg_cv_SSL_LIBS_ONLY_L"
        GRN_WITH_SSL=yes],

  Modified: tools/travis-install.sh (+0 -2)
===================================================================
--- tools/travis-install.sh    2016-10-09 23:22:32 +0900 (79149d2)
+++ tools/travis-install.sh    2016-10-09 23:56:47 +0900 (8ef8410)
@@ -29,8 +29,6 @@ case "${TRAVIS_OS_NAME}" in
          mecab-ipadic \
          pcre \
          cutter
-    pkg-config --modversion libssl
-    pkg-config --cflags --libs libssl
     ;;
 esac
 
-------------- next part --------------
HTML����������������������������...
Download 



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