philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove HAVE_SSL define from configure

Browse Source 
This is no longer needed, we use the HAVE_LIBSSL from AC_CHECK_LIB now.
This commit is contained in:
Kevin Easton
2017-03-17 01:27:30 +11:00
parent 184af728c7
commit 484fc156ed
3 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
configure vendored
View File

@@ -10778,25 +10778,23 @@ _ACEOF
fi fi
fi fi
if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then
cat >>confdefs.h <<\_ACEOF if test x"$ac_cv_lib_ssl_SSL_accept" != x"yes"; then
#define HAVE_SSL 1 if test x"$with_ssl" = x"yes"; then
_ACEOF { { echo "$as_me:$LINENO: error: --with-ssl given, but could not find OpenSSL.
else
if test x"$with_ssl" = x"yes"; then
{ { echo "$as_me:$LINENO: error: --with-ssl given, but could not find OpenSSL.
See \`config.log' for more details." >&5 See \`config.log' for more details." >&5
echo "$as_me: error: --with-ssl given, but could not find OpenSSL. echo "$as_me: error: --with-ssl given, but could not find OpenSSL.
See \`config.log' for more details." >&2;} See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
else else
{ echo "$as_me:$LINENO: WARNING: OpenSSL not found, will not have SSL support." >&5 { echo "$as_me:$LINENO: WARNING: OpenSSL not found, will not have SSL support." >&5
echo "$as_me: WARNING: OpenSSL not found, will not have SSL support." >&2;} echo "$as_me: WARNING: OpenSSL not found, will not have SSL support." >&2;}
fi fi
fi
fi
;; ;;
esac esac

19
configure.in
View File

@@ -563,19 +563,12 @@ esac
case "$with_ssl" in case "$with_ssl" in
yes|check) yes|check)
AC_CHECK_LIB([crypto], [ERR_get_error], [], [], []) AC_CHECK_LIB([crypto], [ERR_get_error], [], [], [])
if test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"; then AS_IF([test x"$ac_cv_lib_crypto_ERR_get_error" = x"yes"], [AC_CHECK_LIB([ssl], [SSL_accept], [], [], [])], [])
AC_CHECK_LIB([ssl], [SSL_accept], [], [], []) AS_IF([test x"$ac_cv_lib_ssl_SSL_accept" != x"yes"],
fi [AS_IF([test x"$with_ssl" = x"yes"],
if test x"$ac_cv_lib_ssl_SSL_accept" = x"yes"; then [AC_MSG_FAILURE([--with-ssl given, but could not find OpenSSL.])],
dnl This would be unnecessary if we used HAVE_LIBSSL in the code [AC_MSG_WARN([OpenSSL not found, will not have SSL support.])])
AC_DEFINE(HAVE_SSL, 1, Define this if the system has SSL support.) ], [])
else
if test x"$with_ssl" = x"yes"; then
AC_MSG_FAILURE([--with-ssl given, but could not find OpenSSL.])
else
AC_MSG_WARN([OpenSSL not found, will not have SSL support.])
fi
fi
;; ;;
esac esac

3
include/defs.h.in
View File

@@ -222,9 +222,6 @@
/* Define to 1 if the system has the type `socklen_t'. */ /* Define to 1 if the system has the type `socklen_t'. */
#undef HAVE_SOCKLEN_T #undef HAVE_SOCKLEN_T
/* Define this if the system has SSL support. */
#undef HAVE_SSL
/* Define to 1 if you have the <stdint.h> header file. */ /* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H #undef HAVE_STDINT_H