Attachment 93244 Details for Bug 131112 – file.diff

[patch] file.diff

file.diff (text/plain), 1.31 KB, created by Dan Lukes on 2009-01-29 10:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Lukes

Created: 2009-01-29 10:10:03 UTC

Size: 1.31 KB

patch

obsolete

>--- databases/mysql51-server/Makefile.orig	2009-01-29 09:55:26.000000000 +0100
>+++ databases/mysql51-server/Makefile	2009-01-29 10:08:01.000000000 +0100
>@@ -42,8 +42,13 @@
> .if defined(WITH_XCHARSET) && ${WITH_XCHARSET} != ""
> CONFIGURE_ARGS+=--with-extra-charsets=${WITH_XCHARSET}
> .endif
>-.if defined(WITH_OPENSSL)
>+.if defined(WITH_YASSL) && defined(WITH_OPENSSL)
>+.error Cannot define both WITH_OPENSSL and WITH_YASSL simultaneously.
>+.elif defined(WITH_YASSL) 
> CONFIGURE_ARGS+=--with-ssl=bundled
>+.elif defined(WITH_OPENSSL)
>+USE_OPENSSL=	yes
>+CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE}
> .endif
> .if defined(WITH_FAST_MUTEXES)
> CONFIGURE_ARGS+=--with-fast-mutexes
>@@ -114,7 +119,8 @@
> 	@${ECHO} "	WITH_CHARSET=charset	Define the primary built-in charset (latin1)."
> 	@${ECHO} "	WITH_XCHARSET=list	Define other built-in charsets (may be 'all')."
> 	@${ECHO} "	WITH_COLLATION=collate	Define default collation (latin1_swedish_ci)."
>-	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections."
>+	@${ECHO} "	WITH_YASSL=yes		Enable secure connections using bundled YASSL library"
>+	@${ECHO} "	WITH_OPENSSL=yes	Enable secure connections using OpenSSL library."
> 	@${ECHO} "	WITH_LINUXTHREADS=yes	Use the linuxthreads pthread library."
> 	@${ECHO} "	WITH_PROC_SCOPE_PTH=yes	Use process scope threads"
> 	@${ECHO} "				(try it if you use libpthread)."

Actions: View | Diff

Attachments on bug 131112: 93244