This commit was manufactured by cvs2svn to create branch 'gtk2'.

[claws.git] / ac / openssl.m4

diff --git a/ac/openssl.m4 b/ac/openssl.m4
index 0e518e46d5b121620bb1682a7d26fed53c0e81d7..f38419e14169267a0bbe344a983b81b31f3662c8 100644 (file)
--- a/ac/openssl.m4
+++ b/ac/openssl.m4
@@ -38,8 +38,6 @@ AC_DEFUN([AM_PATH_OPENSSL],
                AC_ARG_WITH(openssl-libs, [  --with-openssl-libs=PREFIX         Location of OpenSSL libs.],
                        with_openssl_libs="$withval")
                if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then
                AC_ARG_WITH(openssl-libs, [  --with-openssl-libs=PREFIX         Location of OpenSSL libs.],
                        with_openssl_libs="$withval")
                if test "x${with_openssl_libs}" != "xno" -a "x${have_openssl_includes}" != "xno"; then

-                       LIBS_save="$LIBS"
-       

                        case $with_openssl_libs in
                        ""|-L*) ;;
                        *) with_openssl_libs="-L$with_openssl_libs" ;;
                        case $with_openssl_libs in
                        ""|-L*) ;;
                        *) with_openssl_libs="-L$with_openssl_libs" ;;


@@ -48,6 +46,7 @@ AC_DEFUN([AM_PATH_OPENSSL],
                        AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl", DL_LIBS="")
                        AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
                        [
                        AC_CHECK_LIB(dl, dlopen, DL_LIBS="-ldl", DL_LIBS="")
                        AC_CACHE_CHECK([for OpenSSL libraries], openssl_libs,
                        [

+                               LIBS_save="$LIBS"

                                LIBS="$LIBS $with_openssl_libs -lssl -lcrypto $DL_LIBS"
                                AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")
                                LIBS="$LIBS_save"
                                LIBS="$LIBS $with_openssl_libs -lssl -lcrypto $DL_LIBS"
                                AC_TRY_LINK_FUNC(SSL_read, openssl_libs="yes", openssl_libs="no")
                                LIBS="$LIBS_save"