Re: [MOD] STR #4036: Version 1.6 will not compile on Solaris 10 8/11 (update 10)
Michael Sweet <[email protected]>
| Newsgroups | gmane.comp.printing.cups.bugs |
|---|---|
| Message-ID | <[email protected]> |
DO NOT REPLY TO THIS MESSAGE. INSTEAD, POST ANY RESPONSES TO THE LINK BELOW. [STR Closed w/Resolution] Fixed in Subversion repository. Link: http://www.cups.org/str.php?L4036 Version: 1.5-current Fix Version: 1.6-current (r10370) _______________________________________________ cups-bugs mailing list [email protected] http://lists.easysw.com/mailman/listinfo/cups-bugs
str4036.patch
(text/plain, 1.5 KB)
Index: config-scripts/cups-ssl.m4
===================================================================
--- config-scripts/cups-ssl.m4 (revision 10362)
+++ config-scripts/cups-ssl.m4 (working copy)
@@ -3,7 +3,7 @@
dnl
dnl OpenSSL/GNUTLS stuff for CUPS.
dnl
-dnl Copyright 2007-2011 by Apple Inc.
+dnl Copyright 2007-2012 by Apple Inc.
dnl Copyright 1997-2007 by Easy Software Products, all rights reserved.
dnl
dnl These coded instructions, statements, and computer programs are the
@@ -136,9 +136,9 @@
dnl case the RSAREF libraries are needed.
for libcrypto in \
- "-lcrypto" \
- "-lcrypto -lrsaref" \
- "-lcrypto -lRSAglue -lrsaref"
+ "-lcrypto" \
+ "-lcrypto -lrsaref" \
+ "-lcrypto -lRSAglue -lrsaref"
do
AC_CHECK_LIB(ssl,SSL_new,
[have_ssl=1
@@ -149,6 +149,9 @@
$libcrypto)
if test "x${SSLLIBS}" != "x"; then
+ LIBS="$SAVELIBS $SSLLIBS"
+ AC_CHECK_FUNC(SSL_set_tlsext_host_name,
+ AC_DEFINE(HAVE_SSL_SET_TLSEXT_HOST_NAME))
break
fi
done
@@ -173,7 +176,6 @@
EXPORT_SSLLIBS="$SSLLIBS"
AC_SUBST(EXPORT_SSLLIBS)
-
dnl
dnl End of "$Id$".
dnl
Index: config.h.in
===================================================================
--- config.h.in (revision 10362)
+++ config.h.in (working copy)
@@ -296,6 +296,13 @@
/*
+ * Do we have the SSL_set_tlsext_host_name function?
+ */
+
+#undef HAVE_SSL_SET_TLSEXT_HOST_NAME
+
+
+/*
* What Security framework headers do we have?
*/