Module: wine Branch: master Commit: adb8c8615b49dff9fd5f9b720ac30429ddfbd9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb8c8615b49dff9fd5f9b720a...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Apr 3 14:06:09 2013 +0200
configure: Get rid of no longer needed OpenSSL checks.
---
configure | 128 --------------------------------------------------- configure.ac | 13 ----- include/config.h.in | 12 ----- 3 files changed, 0 insertions(+), 153 deletions(-)
diff --git a/configure b/configure index f2a340f..6997375 100755 --- a/configure +++ b/configure @@ -824,7 +824,6 @@ with_mpg123 with_openal with_opencl with_opengl -with_openssl with_osmesa with_oss with_png @@ -1514,7 +1513,6 @@ Optional Packages: --without-openal do not use OpenAL --without-opencl do not use OpenCL --without-opengl do not use OpenGL - --without-openssl do not use OpenSSL --without-osmesa do not use the OSMesa library --without-oss do not use the OSS sound support --without-png do not use PNG @@ -2680,12 +2678,6 @@ if test "${with_opengl+set}" = set; then : fi
-# Check whether --with-openssl was given. -if test "${with_openssl+set}" = set; then : - withval=$with_openssl; if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi -fi - - # Check whether --with-osmesa was given. if test "${with_osmesa+set}" = set; then : withval=$with_osmesa; @@ -5885,8 +5877,6 @@ for ac_header in \ netinet/in_systm.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ - openssl/err.h \ - openssl/ssl.h \ png.h \ poll.h \ port.h \ @@ -11445,124 +11435,6 @@ This is an error since --with-fontconfig was requested." "$LINENO" 5 ;; esac fi
-if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lssl" >&5 -$as_echo_n "checking for -lssl... " >&6; } -if ${ac_cv_lib_soname_ssl+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lssl $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char SSL_library_init (); -int -main () -{ -return SSL_library_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_ssl=`$ac_cv_path_LDD conftest.exe | grep "ssl" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_ssl=`otool -L conftest$ac_exeext | grep "libssl\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*/(libssl.[0-9A-Za-z.]*dylib).*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_ssl=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libssl\.$LIBEXT" | sed -e "s/^.*\[\(libssl\.$LIBEXT[^ ]*\)\].*$/\1/"';2,$d'` - if test "x$ac_cv_lib_soname_ssl" = x; then : - ac_cv_lib_soname_ssl=`$LDD conftest$ac_exeext | grep "libssl\.$LIBEXT" | sed -e "s/^.*(libssl.$LIBEXT[^ ]*).*$/\1/"';2,$d'` -fi ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_ssl" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_ssl" >&5 -$as_echo "$ac_cv_lib_soname_ssl" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBSSL "$ac_cv_lib_soname_ssl" -_ACEOF - - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcrypto" >&5 -$as_echo_n "checking for -lcrypto... " >&6; } -if ${ac_cv_lib_soname_crypto+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_soname_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char BIO_new_socket (); -int -main () -{ -return BIO_new_socket (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_crypto=`$ac_cv_path_LDD conftest.exe | grep "crypto" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_crypto=`otool -L conftest$ac_exeext | grep "libcrypto\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*/(libcrypto.[0-9A-Za-z.]*dylib).*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_crypto=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libcrypto\.$LIBEXT" | sed -e "s/^.*\[\(libcrypto\.$LIBEXT[^ ]*\)\].*$/\1/"';2,$d'` - if test "x$ac_cv_lib_soname_crypto" = x; then : - ac_cv_lib_soname_crypto=`$LDD conftest$ac_exeext | grep "libcrypto\.$LIBEXT" | sed -e "s/^.*(libcrypto.$LIBEXT[^ ]*).*$/\1/"';2,$d'` -fi ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS -fi -if test "x$ac_cv_lib_soname_crypto" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_crypto" >&5 -$as_echo "$ac_cv_lib_soname_crypto" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBCRYPTO "$ac_cv_lib_soname_crypto" -_ACEOF - - -fi -fi -if test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"; then : - case "x$with_openssl" in - x) as_fn_append wine_warnings "|OpenSSL ${notice_platform}development files not found, SSL won't be supported." ;; - xno) ;; - *) as_fn_error $? "OpenSSL ${notice_platform}development files not found, SSL won't be supported. -This is an error since --with-openssl was requested." "$LINENO" 5 ;; -esac -fi - if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lgsm" >&5 diff --git a/configure.ac b/configure.ac index d8f2e8d..080e961 100644 --- a/configure.ac +++ b/configure.ac @@ -66,8 +66,6 @@ AC_ARG_WITH(openal, AS_HELP_STRING([--without-openal],[do not use OpenAL]), AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), [if test "x$withval" = "xno"; then ac_cv_header_CL_cl_h=no; ac_cv_header_OpenCL_opencl_h=no; fi]) AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) -AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), - [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi]) AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), @@ -469,8 +467,6 @@ AC_CHECK_HEADERS(\ netinet/in_systm.h \ netinet/tcp.h \ netinet/tcp_fsm.h \ - openssl/err.h \ - openssl/ssl.h \ png.h \ poll.h \ port.h \ @@ -1604,15 +1600,6 @@ fi WINE_NOTICE_WITH(fontconfig,[test "x$ac_cv_lib_soname_fontconfig" = "x"], [fontconfig ${notice_platform}development files not found, fontconfig won't be supported.])
-dnl **** Check for SSL **** -if test "$ac_cv_header_openssl_err_h" = "yes" -a "$ac_cv_header_openssl_ssl_h" = "yes" -then - WINE_CHECK_SONAME(ssl,SSL_library_init) - WINE_CHECK_SONAME(crypto,BIO_new_socket) -fi -WINE_WARNING_WITH(openssl,[test "x$ac_cv_lib_soname_ssl" = "x" -o "x$ac_cv_lib_soname_crypto" = "x"], - [OpenSSL ${notice_platform}development files not found, SSL won't be supported.]) - dnl **** Check for gsm codec **** if test "$ac_cv_header_gsm_h" = "yes" -o "$ac_cv_header_gsm_gsm_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index 1a5652c..2f30549 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -578,12 +578,6 @@ /* Define to 1 if you have the <OpenCL/opencl.h> header file. */ #undef HAVE_OPENCL_OPENCL_H
-/* Define to 1 if you have the <openssl/err.h> header file. */ -#undef HAVE_OPENSSL_ERR_H - -/* Define to 1 if you have the <openssl/ssl.h> header file. */ -#undef HAVE_OPENSSL_SSL_H - /* Define to 1 if `numaudioengines' is a member of `oss_sysinfo'. */ #undef HAVE_OSS_SYSINFO_NUMAUDIOENGINES
@@ -1241,9 +1235,6 @@ /* Define to the soname of the libcapi20 library. */ #undef SONAME_LIBCAPI20
-/* Define to the soname of the libcrypto library. */ -#undef SONAME_LIBCRYPTO - /* Define to the soname of the libcups library. */ #undef SONAME_LIBCUPS
@@ -1292,9 +1283,6 @@ /* Define to the soname of the libsane library. */ #undef SONAME_LIBSANE
-/* Define to the soname of the libssl library. */ -#undef SONAME_LIBSSL - /* Define to the soname of the libtiff library. */ #undef SONAME_LIBTIFF