Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 646380 | Differences between
and this patch

Collapse All | Expand All

(-)a/m4/ax_check_openssl.m4 (-7 / +17 lines)
Lines 41-56 AC_DEFUN([AX_CHECK_OPENSSL], [ Link Here
41
        [AS_HELP_STRING([--with-openssl=DIR],
41
        [AS_HELP_STRING([--with-openssl=DIR],
42
            [root of the OpenSSL directory])],
42
            [root of the OpenSSL directory])],
43
        [
43
        [
44
	    AS_CASE([$with_openssl],
44
            AS_CASE([$with_openssl],
45
	        [""|y|ye|yes],[ssldirs="$default_ssldirs"],
45
                [""|y|ye|yes],[
46
	    	[n|no],[AC_MSG_ERROR([Invalid --with-openssl value])],
46
                    # if pkg-config is installed and openssl has installed
47
            	[*],[ssldirs="$withval"],
47
                    # a .pc file, then use that information and don't
48
	    	[ssldirs="$default_ssldirs"]
48
                    # search ssldirs
49
	    )
49
                    PKG_CHECK_MODULES([OPENSSL], [libcrypto],
50
                        [
51
                            found=true
52
                            ssldirs=""
53
                        ],
54
                        [ssldirs="$default_ssldirs"])
55
                ],
56
                [n|no],[AC_MSG_ERROR([Invalid --with-openssl value])],
57
                [*],[ssldirs="$withval"],
58
                [ssldirs="$default_ssldirs"]
59
            )
50
        ], [
60
        ], [
51
            # if pkg-config is installed and openssl has installed a .pc file,
61
            # if pkg-config is installed and openssl has installed a .pc file,
52
            # then use that information and don't search ssldirs
62
            # then use that information and don't search ssldirs
53
	    PKG_CHECK_MODULES([OPENSSL], [crypto],
63
	    PKG_CHECK_MODULES([OPENSSL], [libcrypto],
54
 	        [found=true],
64
 	        [found=true],
55
	    	[ssldirs="$default_ssldirs"])
65
	    	[ssldirs="$default_ssldirs"])
56
	
66
	

Return to bug 646380