Re: [MOD] STR #4084: autoconf fails because of cups-ssl.m4 in CUPS 1.5.3
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. FWIW, I basically just added bracketing to work around the autoconf 2.61 bug; the same configure source works fine in 2.68 and the output from 2.68 is less than half the size! :) Link: http://www.cups.org/str.php?L4084 Version: 1.5.3 Fix Version: 1.6-current (r10480) _______________________________________________ cups-bugs mailing list [email protected] http://lists.easysw.com/mailman/listinfo/cups-bugs
str4084.patch
(text/plain, 938 B)
Index: config-scripts/cups-ssl.m4
===================================================================
--- config-scripts/cups-ssl.m4 (revision 10476)
+++ config-scripts/cups-ssl.m4 (working copy)
@@ -124,7 +124,7 @@
dnl Check for the OpenSSL library last...
if test $have_ssl = 0 -a "x$enable_openssl" != "xno"; then
- AC_CHECK_HEADER(openssl/ssl.h,
+ AC_CHECK_HEADER(openssl/ssl.h,[
dnl Save the current libraries so the crypto stuff isn't always
dnl included...
SAVELIBS="$LIBS"
@@ -149,14 +149,16 @@
$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
- LIBS="$SAVELIBS")
+ if test "x${SSLLIBS}" != "x"; then
+ LIBS="$SAVELIBS $SSLLIBS"
+ AC_CHECK_FUNCS(SSL_set_tlsext_host_name)
+ fi
+
+ LIBS="$SAVELIBS"])
fi
fi