diff --git a/.travis.yml b/.travis.yml index a64bb3d2..290c55ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,6 @@ matrix: - os: linux compiler: gcc env: BUILD_TYPE=coverage - - os: linux - compiler: clang - env: BUILD_TYPE=normal - os: linux compiler: clang env: BUILD_TYPE=asan @@ -22,9 +19,6 @@ matrix: - os: osx compiler: clang env: BUILD_TYPE=normal - - os: osx - compiler: clang - env: BUILD_TYPE=normal USE_SYSTEM_OPENSSL=true before_install: - "echo os: [$TRAVIS_OS_NAME] build: [$BUILD_TYPE]" - if [[ "$BUILD_TYPE" == "normal" ]]; then export CFGFLAGS= MYCXXFLAGS= MYLDFLAGS=; fi diff --git a/README.md b/README.md index 930c27be..7d86195e 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,6 @@ SSL/TLS support: * openssl 0.9.7d or later * try installing openssl-dev, openssl-devel or libssl-dev * Mac OS X: OpenSSL from Homebrew is prefered over system - * use `USE_SYSTEM_OPENSSL=true` as environment variable to force - `configure` to use the (deprecated) Mac OS X version modperl: * perl and its bundled libperl diff --git a/configure.ac b/configure.ac index 2f2c5b06..10a2d9bb 100644 --- a/configure.ac +++ b/configure.ac @@ -182,8 +182,6 @@ case "${host_os}" in darwin*) ISDARWIN=1 - AC_ARG_VAR([USE_SYSTEM_OPENSSL],[set USE_SYSTEM_OPENSSL="true" to use the OpenSSL version provided by Mac OS X. Otherwise the Homebrew installed version is used if available. ]) - AC_PATH_PROG([BREW], [brew]) if test -n "$BREW"; then # add default homebrew paths @@ -223,16 +221,12 @@ case "${host_os}" in if test "x$SSL" != "xno"; then AC_MSG_CHECKING([openssl via homebrew]) - if test -z "$USE_SYSTEM_OPENSSL" -o "$USE_SYSTEM_OPENSSL" = "false"; then - openssl_prefix=`$BREW --prefix openssl` - if test -n "$openssl_prefix"; then - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$openssl_prefix/lib/pkgconfig" - AC_MSG_RESULT([$openssl_prefix]) - else - AC_MSG_RESULT([no]) - fi + openssl_prefix=`$BREW --prefix openssl` + if test -n "$openssl_prefix"; then + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$openssl_prefix/lib/pkgconfig" + AC_MSG_RESULT([$openssl_prefix]) else - AC_MSG_RESULT([user forced system openssl]) + AC_MSG_RESULT([no]) fi fi fi